From 83cf2f50dfc906f7f2014570b37863d98fe89bc7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Jun 2018 23:08:25 +0200 Subject: shabby beginnings --- asm/rom_8011DC0.s | 320 +++--------------------------------------------------- src/rom_8011DC0.c | 253 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 263 insertions(+), 310 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index b7f03739a..2bc67c5c3 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -5,290 +5,6 @@ .text - thumb_func_start nullsub_89 -nullsub_89: @ 80124E8 - bx lr - thumb_func_end nullsub_89 - - thumb_func_start sub_80124EC -sub_80124EC: @ 80124EC - push {r4-r6,lr} - sub sp, 0x8 - adds r4, r1, 0 - lsls r0, 24 - lsrs r6, r0, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r2, 24 - lsrs r5, r2, 24 - adds r0, r6, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - lsls r4, 8 - movs r0, 0x90 - lsls r0, 6 - cmp r4, r0 - beq _08012588 - cmp r4, r0 - bgt _08012526 - movs r0, 0x80 - lsls r0, 2 - cmp r4, r0 - beq _08012538 - movs r0, 0x80 - lsls r0, 3 - cmp r4, r0 - beq _08012544 - b _080125A6 -_08012526: - movs r0, 0x94 - lsls r0, 6 - cmp r4, r0 - beq _08012554 - movs r0, 0xD4 - lsls r0, 6 - cmp r4, r0 - beq _08012564 - b _080125A6 -_08012538: - ldr r1, =gUnknown_082EDB60 - subs r0, r5, 0x1 - lsls r0, 2 - b _0801256C - .pool -_08012544: - ldr r1, =gUnknown_082EDB60 - subs r0, r5, 0x1 - lsls r0, 2 - adds r1, 0x14 - b _0801256C - .pool -_08012554: - ldr r1, =gUnknown_082EDB60 - subs r0, r5, 0x1 - lsls r0, 2 - adds r1, 0x28 - b _0801256C - .pool -_08012564: - ldr r1, =gUnknown_082EDB60 - subs r0, r5, 0x1 - lsls r0, 2 - adds r1, 0x3C -_0801256C: - adds r0, r1 - ldr r2, [r0] - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r0, r6, 0 - movs r1, 0x1 - movs r3, 0 - bl sub_80173E0 - b _080125A6 - .pool -_08012588: - ldr r1, =gUnknown_082EDB60 - subs r0, r5, 0x1 - lsls r0, 2 - adds r1, 0x50 - adds r0, r1 - ldr r2, [r0] - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r0, r6, 0 - movs r1, 0x1 - movs r3, 0 - bl sub_80173E0 -_080125A6: - adds r0, r6, 0 - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80124EC - - thumb_func_start sub_80125BC -sub_80125BC: @ 80125BC - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x28 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r6, =gSaveBlock2Ptr - ldr r2, [r6] - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - mov r8, r0 - str r0, [sp, 0x4] - adds r0, r4, 0 - movs r1, 0x1 - movs r3, 0 - bl sub_80173E0 - ldr r1, =gText_UnkCtrlCodeF907 - add r0, sp, 0x8 - bl StringCopy - adds r5, r0, 0 - ldr r0, [r6] - adds r0, 0xA - bl sub_8015658 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r5, 0 - movs r2, 0x2 - movs r3, 0x5 - bl ConvertIntToDecimalStringN - movs r0, 0x11 - str r0, [sp] - mov r0, r8 - str r0, [sp, 0x4] - adds r0, r4, 0 - movs r1, 0x1 - add r2, sp, 0x8 - movs r3, 0 - bl sub_80173E0 - add sp, 0x28 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80125BC - - thumb_func_start sub_801262C -sub_801262C: @ 801262C - push {lr} - lsls r1, 24 - lsrs r1, 24 - subs r0, r1, 0x1 - cmp r0, 0x1B - bhi _080126C0 - lsls r0, 2 - ldr r1, =_08012648 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08012648: - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126C0 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 - .4byte _080126B8 -_080126B8: - ldr r0, =gStringVar4 - ldr r1, =gText_AwaitingCommunication - bl StringExpandPlaceholders -_080126C0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_801262C - - thumb_func_start sub_80126CC -sub_80126CC: @ 80126CC - push {lr} - subs r0, 0x9 - cmp r0, 0x12 - bhi _08012734 - lsls r0, 2 - ldr r1, =_080126E4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080126E4: - .4byte _08012730 - .4byte _08012730 - .4byte _08012730 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012730 - .4byte _08012730 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012734 - .4byte _08012730 - .4byte _08012730 - .4byte _08012730 - .4byte _08012730 - .4byte _08012730 -_08012730: - movs r0, 0x1 - b _08012736 -_08012734: - movs r0, 0 -_08012736: - pop {r1} - bx r1 - thumb_func_end sub_80126CC - - thumb_func_start BerryBlenderLinkBecomeLeader -BerryBlenderLinkBecomeLeader: @ 801273C - push {lr} - ldr r0, =sub_8012780 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gUnknown_02022C30 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r1, r0 - str r1, [r2] - ldr r0, =gUnknown_03000DA0 - str r1, [r0] - movs r0, 0 - strb r0, [r1, 0xC] - strb r0, [r1, 0xD] - ldr r1, =gSpecialVar_Result - strh r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end BerryBlenderLinkBecomeLeader thumb_func_start sub_8012780 sub_8012780: @ 8012780 @@ -730,7 +446,7 @@ _08012BA8: ldr r0, [r6] adds r0, r1 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 lsls r0, 16 lsrs r0, 16 ldrb r2, [r6, 0x13] @@ -772,7 +488,7 @@ _08012BF6: ldr r0, [r6] adds r0, r1 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -791,7 +507,7 @@ _08012C28: ldr r0, [r6] adds r0, r1 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -816,7 +532,7 @@ _08012C5C: ldr r0, [r6] adds r0, r1 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 lsls r0, 16 lsrs r0, 16 ldrb r2, [r6, 0x13] @@ -890,7 +606,7 @@ _08012D04: adds r4, r0, 0 adds r4, 0x10 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -2564,7 +2280,7 @@ sub_8013BD8: @ 8013BD8 adds r4, r0, 0 adds r4, 0x10 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -4334,7 +4050,7 @@ _08014C82: ldr r0, [r5] adds r0, r1 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -4353,7 +4069,7 @@ _08014CC4: ldr r0, [r5] adds r0, r1 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -4374,7 +4090,7 @@ _08014CF2: ldr r0, [r5] adds r0, r1 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 lsls r0, 16 lsrs r0, 16 ldrb r2, [r5, 0x13] @@ -4423,7 +4139,7 @@ _08014D64: adds r4, r0, 0 adds r4, 0x10 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -4832,7 +4548,7 @@ _080150D6: adds r4, r0, 0 adds r4, 0x10 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -5193,7 +4909,7 @@ _08015452: adds r4, r0, 0 adds r4, 0x10 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -5391,14 +5107,14 @@ UnionRoomSpecial: @ 801560C .pool thumb_func_end UnionRoomSpecial - thumb_func_start sub_8015658 -sub_8015658: @ 8015658 + thumb_func_start ReadAsU16 +ReadAsU16: @ 8015658 ldrb r1, [r0, 0x1] lsls r1, 8 ldrb r0, [r0] orrs r0, r1 bx lr - thumb_func_end sub_8015658 + thumb_func_end ReadAsU16 thumb_func_start sub_8015664 sub_8015664: @ 8015664 @@ -7528,7 +7244,7 @@ _08016A4A: ldr r0, [r5] adds r0, r4 adds r0, 0x2 - bl sub_8015658 + bl ReadAsU16 lsls r0, 16 lsrs r0, 16 mov r1, sp @@ -9531,7 +9247,7 @@ sub_80179AC: @ 80179AC bl sub_8018404 adds r4, 0x2 adds r0, r4, 0 - bl sub_8015658 + bl ReadAsU16 lsls r0, 16 lsrs r0, 16 mov r1, sp @@ -9563,7 +9279,7 @@ sub_80179D4: @ 80179D4 adds r1, r5, 0 bl sub_8018404 adds r0, r5, 0x2 - bl sub_8015658 + bl ReadAsU16 lsls r0, 16 lsrs r0, 16 adds r1, r4, 0 diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 9076b611a..f37b4019f 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1,18 +1,255 @@ - -// Includes #include "global.h" +#include "window.h" +#include "bg.h" +#include "string_util.h" +#include "task.h" +#include "event_data.h" +#include "link.h" +#include "link_rfu.h" +#include "librfu.h" +#include "malloc.h" +#include "menu.h" +#include "list_menu.h" +#include "menu_helpers.h" + +struct UnkStruct_02 +{ + struct UnkLinkRfuStruct_02022B14 field_0; + u8 field_D; + u8 field_E; + u8 field_F; + u8 playerName[PLAYER_NAME_LENGTH]; + u16 field_18; + u8 field_1A_0:2; + u8 field_1A_1:1; + u8 field_1B; +}; + +struct UnkStruct_01 +{ + struct UnkStruct_02 *field_0; + void *field_4; + void *field_8; + u8 field_C; + u8 field_D; + u8 field_E; + u8 field_F; + u8 field_10; + u8 field_11; + u8 field_12; + u8 field_13; + u8 field_14; + u8 field_15; + u8 field_16; + u8 field_17; +}; -// Static type declarations +extern struct UnkStruct_01 *gUnknown_02022C30; -// Static RAM declarations -IWRAM_DATA u32 gUnknown_03000DA0; +extern u8 gUnknown_02022C2C; +extern u8 gUnknown_02022C2D; + +// IWRAM vars +IWRAM_DATA struct UnkStruct_01 *gUnknown_03000DA0; IWRAM_DATA u32 gUnknown_03000DA4; IWRAM_DATA void *gUnknown_03000DA8; IWRAM_DATA void *gUnknown_03000DAC; IWRAM_DATA bool32 gUnknown_03000DB0; -// Static ROM declarations +// this file's functions +void sub_80173E0(u8 windowId, u8 arg1, const u8 *str, u8 arg3, u8 arg4, u8 arg5); +u16 ReadAsU16(const u8 *ptr); +void sub_8012780(u8 taskId); +void sub_80175EC(void *arg0, u8 count); +void sub_8017580(void *arg0, u8 count); +u8 sub_8016FC0(void *arg0, u32 arg1); +bool8 sub_8017064(u8 *arg0, const u8 *str); +void sub_801320C(struct UnkStruct_01 *arg0, u32 arg1, u32 arg2); + +// const rom data +extern const u8 *const gUnknown_082EDB60[][5]; +extern const u8 gText_UnkCtrlCodeF907[]; +extern const u8 gUnknown_082EDBC4[]; +extern const u8 gText_AwaitingCommunication[]; +extern const u32 gUnknown_082F00C4[]; +extern const struct WindowTemplate gUnknown_082F00BC; +extern const struct WindowTemplate gUnknown_082F0124; +extern const struct WindowTemplate gUnknown_082F012C; +extern const struct WindowTemplate gUnknown_082F011C; +extern const struct ListMenuTemplate gUnknown_082F015C; +extern const u8 *const gUnknown_082F0048[]; + +// code +void nullsub_89(void) +{ + +} + +void sub_80124EC(u8 windowId, u8 arg1, u8 stringId) +{ + FillWindowPixelBuffer(windowId, 0x11); + switch (arg1 << 8) + { + case 0x200: + sub_80173E0(windowId, 1, gUnknown_082EDB60[0][stringId - 1], 0, 1, 0); + break; + case 0x400: + sub_80173E0(windowId, 1, gUnknown_082EDB60[1][stringId - 1], 0, 1, 0); + break; + case 0x2500: + sub_80173E0(windowId, 1, gUnknown_082EDB60[2][stringId - 1], 0, 1, 0); + break; + case 0x3500: + sub_80173E0(windowId, 1, gUnknown_082EDB60[3][stringId - 1], 0, 1, 0); + break; + case 0x2400: + sub_80173E0(windowId, 1, gUnknown_082EDB60[4][stringId - 1], 0, 1, 0); + break; + } + + CopyWindowToVram(windowId, 2); +} + +void sub_80125BC(u8 windowId) +{ + u8 text[30]; + u8 *txtPtr; + + sub_80173E0(windowId, 1, gSaveBlock2Ptr->playerName, 0, 1, 0); + txtPtr = StringCopy(text, gText_UnkCtrlCodeF907); + ConvertIntToDecimalStringN(txtPtr, ReadAsU16(gSaveBlock2Ptr->playerTrainerId), STR_CONV_MODE_LEADING_ZEROS, 5); + sub_80173E0(windowId, 1, text, 0, 0x11, 0); +} + +void sub_801262C(u8 *dst, u8 caseId) +{ + switch (caseId) + { + case 1 ... 4: + case 9 ... 11: + case 14 ... 16: + case 21 ... 28: + // UB: argument *dst isn't used, instead it always prints to gStringVar4 + StringExpandPlaceholders(gStringVar4, gText_AwaitingCommunication); + break; + } +} + +bool32 sub_80126CC(u32 caseId) +{ + switch (caseId) + { + case 9 ... 11: + case 15 ... 16: + case 23 ... 27: + return TRUE; + default: + return FALSE; + } +} + +void BerryBlenderLinkBecomeLeader(void) +{ + u8 taskId; + struct UnkStruct_01 *dataPtr; + + taskId = CreateTask(sub_8012780, 0); + gUnknown_02022C30 = dataPtr = (void*)(gTasks[taskId].data); + gUnknown_03000DA0 = dataPtr; + + dataPtr->field_C = 0; + dataPtr->field_D = 0; + gSpecialVar_Result = 0; +} + +void sub_8012780(u8 taskId) +{ + struct UnkStruct_01 *data = gUnknown_02022C30; + + switch (data->field_C) + { + case 0: + if (gSpecialVar_0x8004 == 20 || gSaveBlock2Ptr->frontierChosenLvl == 1) + gSpecialVar_0x8004++; + gUnknown_02022C2C = gUnknown_082F00C4[gSpecialVar_0x8004]; + gUnknown_02022C2D = gUnknown_082F00C4[gSpecialVar_0x8004] >> 8; + sub_8010F84(gUnknown_02022C2C, 0, 0); + sub_800B488(); + OpenLink(); + sub_8011C10(gUnknown_02022C2D & 0xF); + data->field_C = 3; + break; + case 3: + data->field_4 = AllocZeroed(0x70); + data->field_0 = AllocZeroed(0xA0); + data->field_8 = AllocZeroed(0xA0); + sub_80175EC(data->field_4, 4); + sub_8017580(data->field_0, 5); + sub_800DF90(&data->field_0->field_0, data->field_0->playerName); + data->field_0->field_18 = 0; + data->field_0->field_1A_0 = 1; + data->field_0->field_1A_1 = 0; + data->field_0->field_1B = 0; + data->field_17 = sub_8016FC0(data->field_4, 0xFF); + data->field_10 = AddWindow(&gUnknown_082F00BC); + switch (gUnknown_02022C2D & 0xF) + { + case 2: + case 3: + case 4: + data->field_F = AddWindow(&gUnknown_082F011C); + break; + case 5: + data->field_F = AddWindow(&gUnknown_082F0124); + break; + } + data->field_11 = AddWindow(&gUnknown_082F012C); + + FillWindowPixelBuffer(data->field_10, 0x22); + sub_80173E0(data->field_10, 0, gUnknown_082EDBC4, 8, 1, 4); + PutWindowTilemap(data->field_10); + CopyWindowToVram(data->field_10, 2); + + NewMenuHelpers_DrawStdWindowFrame(data->field_F, FALSE); + gMultiuseListMenuTemplate = gUnknown_082F015C; + gMultiuseListMenuTemplate.windowId = data->field_F; + data->field_12 = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); + + NewMenuHelpers_DrawStdWindowFrame(data->field_11, FALSE); + PutWindowTilemap(data->field_11); + CopyWindowToVram(data->field_11, 2); -// .rodata + CopyBgTilemapBufferToVram(0); + data->field_13 = 1; + data->field_C = 4; + break; + case 4: + StringCopy(gStringVar1, gUnknown_082F0048[gUnknown_02022C2C]); + if ((gUnknown_02022C2D >> 4) != 0) + { + if (data->field_13 > (gUnknown_02022C2D >> 4) - 1 && (gUnknown_02022C2D & 0xF) != 0) + StringExpandPlaceholders(gStringVar4, gText_AwaitingLink); + else + StringExpandPlaceholders(gStringVar4, gText_AwaitingCommunication); + } + else + { + sub_801262C(gStringVar4, gUnknown_02022C2C); + } -// .text + sub_80124EC(data->field_11, gUnknown_02022C2D, data->field_13); + data->field_C = 5; + break; + case 5: + if (sub_8017064(&data->field_D, gStringVar4)) + data->field_C = 6; + break; + case 6: + sub_801320C(data, 7, 10); + if (gMain.newKeys & B_BUTTON) + { + if (data->field_13) + } + break; + } +} -- cgit v1.2.3 From e95b1156d22e2652b6d13ea1af123aed7ab5221c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 3 Jun 2018 09:37:01 +0200 Subject: more progress --- asm/rom_8011DC0.s | 2224 +---------------------- data/scripts/contest_hall.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- data/scripts/pokeblocks.inc | 326 ++-- include/librfu.h | 2 - include/link_rfu.h | 16 + src/link_rfu.c | 12 +- src/rom_8011DC0.c | 933 +++++++++- 8 files changed, 1103 insertions(+), 2414 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 2bc67c5c3..97b27bab9 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -6,2206 +6,6 @@ .text - thumb_func_start sub_8012780 -sub_8012780: @ 8012780 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gUnknown_02022C30 - ldr r6, [r0] - ldrb r0, [r6, 0xC] - cmp r0, 0x1E - bls _0801279A - bl _08012F50 -_0801279A: - lsls r0, 2 - ldr r1, =_080127AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080127AC: - .4byte _08012828 - .4byte _08012F50 - .4byte _08012F50 - .4byte _080128A0 - .4byte _080129C8 - .4byte _08012A50 - .4byte _08012A6C - .4byte _08012B8C - .4byte _08012F50 - .4byte _08012AFC - .4byte _08012B14 - .4byte _08012BA8 - .4byte _08012C5C - .4byte _08012D5A - .4byte _08012D78 - .4byte _08012D8A - .4byte _08012DA8 - .4byte _08012E62 - .4byte _08012E78 - .4byte _08012DF2 - .4byte _08012E10 - .4byte _08012ED0 - .4byte _08012EFC - .4byte _08012ED0 - .4byte _08012EE6 - .4byte _08012F50 - .4byte _08012F14 - .4byte _08012F50 - .4byte _08012F50 - .4byte _08012B54 - .4byte _08012EB6 -_08012828: - ldr r0, =gSpecialVar_0x8004 - ldrh r2, [r0] - adds r3, r0, 0 - cmp r2, 0x14 - bne _08012848 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000ca9 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _08012848 - adds r0, r2, 0x1 - strh r0, [r3] -_08012848: - ldr r2, =gUnknown_02022C2C - ldr r1, =gUnknown_082F00C4 - ldrh r0, [r3] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - strb r0, [r2] - ldr r4, =gUnknown_02022C2D - ldrh r0, [r3] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsrs r0, 8 - strb r0, [r4] - ldrb r0, [r2] - movs r1, 0 - movs r2, 0 - bl sub_8010F84 - bl sub_800B488 - bl OpenLink - ldrb r1, [r4] - movs r0, 0xF - ands r0, r1 - bl sub_8011C10 - movs r0, 0x3 - strb r0, [r6, 0xC] - b _08012F50 - .pool -_080128A0: - movs r0, 0x70 - bl AllocZeroed - str r0, [r6, 0x4] - movs r0, 0xA0 - bl AllocZeroed - str r0, [r6] - movs r0, 0xA0 - bl AllocZeroed - str r0, [r6, 0x8] - ldr r0, [r6, 0x4] - movs r1, 0x4 - bl sub_80175EC - ldr r0, [r6] - movs r1, 0x5 - bl sub_8017580 - ldr r0, [r6] - adds r1, r0, 0 - adds r1, 0x10 - bl sub_800DF90 - ldr r1, [r6] - movs r3, 0 - movs r0, 0 - strh r0, [r1, 0x18] - ldr r2, [r6] - ldrb r1, [r2, 0x1A] - subs r0, 0x4 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x1A] - ldr r2, [r6] - ldrb r1, [r2, 0x1A] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x1A] - ldr r0, [r6] - strb r3, [r0, 0x1B] - ldr r0, [r6, 0x4] - movs r1, 0xFF - bl sub_8016FC0 - strb r0, [r6, 0x17] - ldr r0, =gUnknown_082F00BC - bl AddWindow - strb r0, [r6, 0x10] - ldr r0, =gUnknown_02022C2D - ldrb r0, [r0] - movs r1, 0xF - ands r1, r0 - cmp r1, 0x2 - blt _08012938 - cmp r1, 0x4 - ble _08012928 - cmp r1, 0x5 - beq _08012930 - b _08012938 - .pool -_08012928: - ldr r0, =gUnknown_082F011C - b _08012932 - .pool -_08012930: - ldr r0, =gUnknown_082F0124 -_08012932: - bl AddWindow - strb r0, [r6, 0xF] -_08012938: - ldr r0, =gUnknown_082F012C - bl AddWindow - strb r0, [r6, 0x11] - ldrb r0, [r6, 0x10] - movs r1, 0x22 - bl FillWindowPixelBuffer - ldrb r0, [r6, 0x10] - ldr r2, =gUnknown_082EDBC4 - movs r3, 0x1 - mov r8, r3 - str r3, [sp] - movs r4, 0x4 - str r4, [sp, 0x4] - movs r1, 0 - movs r3, 0x8 - bl sub_80173E0 - ldrb r0, [r6, 0x10] - bl PutWindowTilemap - ldrb r0, [r6, 0x10] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r6, 0xF] - movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame - ldr r0, =gMultiuseListMenuTemplate - adds r2, r0, 0 - ldr r1, =gUnknown_082F015C - ldm r1!, {r3,r5,r7} - stm r2!, {r3,r5,r7} - ldm r1!, {r3,r5,r7} - stm r2!, {r3,r5,r7} - ldrb r1, [r6, 0xF] - strb r1, [r0, 0x10] - movs r1, 0 - movs r2, 0 - bl ListMenuInit - strb r0, [r6, 0x12] - ldrb r0, [r6, 0x11] - movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame - ldrb r0, [r6, 0x11] - bl PutWindowTilemap - ldrb r0, [r6, 0x11] - movs r1, 0x2 - bl CopyWindowToVram - movs r0, 0 - bl CopyBgTilemapBufferToVram - mov r5, r8 - strb r5, [r6, 0x13] - strb r4, [r6, 0xC] - b _08012F50 - .pool -_080129C8: - ldr r0, =gStringVar1 - ldr r2, =gUnknown_082F0048 - ldr r4, =gUnknown_02022C2C - ldrb r1, [r4] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - ldr r0, =gUnknown_02022C2D - ldrb r2, [r0] - lsrs r0, r2, 4 - cmp r0, 0 - beq _08012A2C - ldrb r1, [r6, 0x13] - subs r0, 0x1 - cmp r1, r0 - ble _08012A18 - movs r0, 0xF - ands r0, r2 - cmp r0, 0 - beq _08012A18 - ldr r0, =gStringVar4 - ldr r1, =gText_AwaitingLink - bl StringExpandPlaceholders - b _08012A34 - .pool -_08012A18: - ldr r0, =gStringVar4 - ldr r1, =gText_AwaitingCommunication - bl StringExpandPlaceholders - b _08012A34 - .pool -_08012A2C: - ldr r0, =gStringVar4 - ldrb r1, [r4] - bl sub_801262C -_08012A34: - ldrb r0, [r6, 0x11] - ldr r1, =gUnknown_02022C2D - ldrb r1, [r1] - ldrb r2, [r6, 0x13] - bl sub_80124EC - movs r0, 0x5 - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012A50: - adds r0, r6, 0 - adds r0, 0xD - ldr r1, =gStringVar4 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _08012A62 - b _08012F50 -_08012A62: - movs r0, 0x6 - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012A6C: - adds r0, r6, 0 - movs r1, 0x7 - movs r2, 0xA - bl sub_801320C - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08012AA8 - ldrb r0, [r6, 0x13] - cmp r0, 0x1 - bne _08012A90 - movs r0, 0x17 - b _08012AA6 - .pool -_08012A90: - ldr r0, =gUnknown_02022C2D - ldrb r1, [r0] - movs r0, 0xF0 - ands r0, r1 - cmp r0, 0 - beq _08012AA4 - movs r0, 0x1E - b _08012AA6 - .pool -_08012AA4: - movs r0, 0x13 -_08012AA6: - strb r0, [r6, 0xC] -_08012AA8: - ldr r0, =gUnknown_02022C2D - ldrb r2, [r0] - lsrs r0, r2, 4 - cmp r0, 0 - beq _08012ADE - ldrb r1, [r6, 0x13] - subs r0, 0x1 - cmp r1, r0 - ble _08012ADE - movs r4, 0xF - adds r0, r4, 0 - ands r0, r2 - cmp r0, 0 - beq _08012ADE - bl sub_8012240 - cmp r0, 0 - beq _08012ADE - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _08012ADE - strb r4, [r6, 0xC] - bl sub_800EF38 -_08012ADE: - ldrb r0, [r6, 0xC] - cmp r0, 0x6 - beq _08012AE6 - b _08012F50 -_08012AE6: - bl sub_80105EC - cmp r0, 0 - bne _08012AF0 - b _08012F50 -_08012AF0: - b _08012C56 - .pool -_08012AFC: - bl sub_80105EC - cmp r0, 0 - beq _08012B06 - b _08012F50 -_08012B06: - movs r0, 0x6 - strb r0, [r6, 0xC] - ldr r0, [r6] - bl sub_8013398 - strb r0, [r6, 0x13] - b _08012F50 -_08012B14: - movs r3, 0 - ldr r0, =gUnknown_02022C2C - ldrb r1, [r0] - movs r0, 0xF - ands r0, r1 - cmp r0, 0x2 - bne _08012B24 - movs r3, 0x1 -_08012B24: - adds r0, r6, 0 - adds r0, 0xD - ldr r2, =gUnknown_082EDDC4 - lsls r1, r3, 2 - adds r1, r2 - ldr r1, [r1] - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _08012B3C - b _08012F50 -_08012B3C: - ldr r0, [r6] - bl sub_8013398 - strb r0, [r6, 0x13] - ldrb r0, [r6, 0x12] - bl sub_81AE70C - b _08012E5C - .pool -_08012B54: - ldr r0, =gUnknown_02022C2D - ldrb r0, [r0] - movs r1, 0xF - ands r1, r0 - movs r0, 0x2 - eors r1, r0 - negs r0, r1 - orrs r0, r1 - lsrs r3, r0, 31 - adds r0, r6, 0 - adds r0, 0xD - ldr r2, =gUnknown_082EDDC4 - lsls r1, r3, 2 - adds r1, r2 - ldr r1, [r1] - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _08012B7E - b _08012F50 -_08012B7E: - movs r0, 0x15 - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012B8C: - adds r0, r6, 0 - adds r0, 0xD - ldr r1, =gStringVar4 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _08012B9E - b _08012F50 -_08012B9E: - movs r0, 0xB - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012BA8: - adds r4, r6, 0 - adds r4, 0xD - ldrb r1, [r6, 0x13] - lsls r1, 5 - ldr r0, [r6] - adds r0, r1 - adds r0, 0x2 - bl ReadAsU16 - lsls r0, 16 - lsrs r0, 16 - ldrb r2, [r6, 0x13] - lsls r2, 5 - ldr r1, [r6] - adds r1, r2 - adds r1, 0x10 - bl sub_801064C - adds r1, r0, 0 - adds r0, r4, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08012C28 - cmp r1, r0 - bgt _08012BEC - subs r0, 0x2 - cmp r1, r0 - beq _08012C56 - b _08012F50 -_08012BEC: - cmp r1, 0 - beq _08012BF6 - cmp r1, 0x1 - beq _08012C28 - b _08012F50 -_08012BF6: - bl sub_800E0E8 - movs r0, 0 - movs r1, 0 - bl CreateWirelessStatusIndicatorSprite - movs r0, 0x5 - strb r0, [r6, 0x19] - ldrb r1, [r6, 0x13] - lsls r1, 5 - ldr r0, [r6] - adds r0, r1 - adds r0, 0x2 - bl ReadAsU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldrb r0, [r6, 0x13] - lsls r0, 5 - ldr r2, [r6] - adds r2, r0 - adds r2, 0x10 - movs r0, 0x5 - b _08012C4C -_08012C28: - movs r0, 0x6 - strb r0, [r6, 0x19] - ldrb r1, [r6, 0x13] - lsls r1, 5 - ldr r0, [r6] - adds r0, r1 - adds r0, 0x2 - bl ReadAsU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldrb r0, [r6, 0x13] - lsls r0, 5 - ldr r2, [r6] - adds r2, r0 - adds r2, 0x10 - movs r0, 0x6 -_08012C4C: - bl sub_8010688 - movs r0, 0xC - strb r0, [r6, 0xC] - b _08012F50 -_08012C56: - movs r0, 0x9 - strb r0, [r6, 0xC] - b _08012F50 -_08012C5C: - ldrb r1, [r6, 0x13] - lsls r1, 5 - ldr r0, [r6] - adds r0, r1 - adds r0, 0x2 - bl ReadAsU16 - lsls r0, 16 - lsrs r0, 16 - ldrb r2, [r6, 0x13] - lsls r2, 5 - ldr r1, [r6] - adds r1, r2 - adds r1, 0x10 - bl sub_8010714 - cmp r0, 0x1 - bne _08012D4A - ldrb r0, [r6, 0x19] - cmp r0, 0x5 - bne _08012D04 - ldr r1, [r6] - ldrb r0, [r6, 0x13] - lsls r0, 5 - adds r1, r0 - movs r0, 0 - strb r0, [r1, 0x1B] - ldrb r0, [r6, 0x12] - bl sub_81AE70C - ldrb r0, [r6, 0x13] - adds r0, 0x1 - strb r0, [r6, 0x13] - ldr r1, =gUnknown_02022C2D - ldrb r1, [r1] - movs r3, 0xF - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r3, 0 - ands r0, r1 - cmp r2, r0 - bne _08012D40 - movs r0, 0xF0 - ands r0, r1 - cmp r0, 0 - bne _08012CBC - cmp r2, 0x4 - bne _08012CC4 -_08012CBC: - strb r3, [r6, 0xC] - b _08012CE0 - .pool -_08012CC4: - ldr r0, =gStringVar1 - ldrb r2, [r6, 0x13] - lsls r2, 5 - subs r2, 0x20 - ldr r1, [r6] - adds r1, r2 - bl sub_8018404 - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EDC9C - bl StringExpandPlaceholders - movs r0, 0xD - strb r0, [r6, 0xC] -_08012CE0: - bl sub_800EF38 - ldrb r0, [r6, 0x11] - ldr r1, =gUnknown_02022C2D - ldrb r1, [r1] - ldrb r2, [r6, 0x13] - bl sub_80124EC - b _08012D44 - .pool -_08012D04: - ldrb r1, [r6, 0x13] - lsls r1, 5 - ldr r0, [r6] - adds r0, r1 - adds r4, r0, 0 - adds r4, 0x10 - adds r0, 0x2 - bl ReadAsU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl sub_8011DC0 - ldr r1, [r6] - ldrb r0, [r6, 0x13] - lsls r0, 5 - adds r1, r0 - ldrb r2, [r1, 0x1A] - movs r0, 0x4 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x1A] - ldr r0, [r6] - bl sub_8013398 - ldrb r0, [r6, 0x12] - bl sub_81AE70C -_08012D40: - movs r0, 0x4 - strb r0, [r6, 0xC] -_08012D44: - movs r0, 0 - strb r0, [r6, 0x19] - b _08012F50 -_08012D4A: - cmp r0, 0x2 - beq _08012D50 - b _08012F50 -_08012D50: - movs r0, 0 - movs r1, 0 - bl sub_8011A64 - b _08012E5C -_08012D5A: - adds r0, r6, 0 - adds r0, 0xD - ldr r1, =gStringVar4 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _08012D6C - b _08012F50 -_08012D6C: - movs r0, 0xE - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012D78: - ldrb r0, [r6, 0xE] - adds r0, 0x1 - strb r0, [r6, 0xE] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x78 - bhi _08012D88 - b _08012F50 -_08012D88: - b _08012DCE -_08012D8A: - adds r0, r6, 0 - adds r0, 0xD - ldr r1, =gUnknown_082EDC5C - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _08012D9C - b _08012F50 -_08012D9C: - movs r0, 0x10 - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012DA8: - adds r0, r6, 0 - adds r0, 0xD - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _08012DCE - cmp r1, 0 - bgt _08012DC8 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08012DD4 - b _08012F50 -_08012DC8: - cmp r1, 0x1 - beq _08012DD4 - b _08012F50 -_08012DCE: - movs r0, 0x11 - strb r0, [r6, 0xC] - b _08012F50 -_08012DD4: - ldr r0, =gUnknown_02022C2D - ldrb r1, [r0] - movs r0, 0xF0 - ands r0, r1 - cmp r0, 0 - beq _08012DEC - movs r0, 0x1E - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012DEC: - movs r0, 0x13 - strb r0, [r6, 0xC] - b _08012F50 -_08012DF2: - adds r0, r6, 0 - adds r0, 0xD - ldr r1, =gUnknown_082EDC78 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _08012E04 - b _08012F50 -_08012E04: - movs r0, 0x14 - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012E10: - adds r0, r6, 0 - adds r0, 0xD - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _08012EC6 - cmp r1, 0 - bgt _08012E30 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08012E36 - b _08012F50 -_08012E30: - cmp r1, 0x1 - beq _08012E36 - b _08012F50 -_08012E36: - ldr r0, =gUnknown_02022C2D - ldrb r2, [r0] - movs r0, 0xF0 - ands r0, r2 - cmp r0, 0 - beq _08012E4C - movs r0, 0xF - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012E4C: - movs r3, 0xF - ldrb r1, [r6, 0x13] - adds r0, r3, 0 - ands r0, r2 - cmp r1, r0 - bne _08012E5C - strb r3, [r6, 0xC] - b _08012F50 -_08012E5C: - movs r0, 0x4 - strb r0, [r6, 0xC] - b _08012F50 -_08012E62: - adds r0, r6, 0 - movs r1, 0x7 - movs r2, 0x1D - bl sub_801320C - lsls r0, 24 - cmp r0, 0 - bne _08012F50 - movs r0, 0x12 - strb r0, [r6, 0xC] - b _08012F50 -_08012E78: - bl sub_800EF1C - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - beq _08012EAE - movs r0, 0 - bl sub_800EF58 - cmp r0, 0 - beq _08012E94 - movs r0, 0x1A - strb r0, [r6, 0xC] - b _08012F50 -_08012E94: - ldrh r0, [r6, 0x1A] - adds r0, 0x1 - strh r0, [r6, 0x1A] - lsls r0, 16 - movs r1, 0x96 - lsls r1, 17 - cmp r0, r1 - bls _08012F50 - movs r0, 0x1D - strb r0, [r6, 0xC] - movs r0, 0 - strb r0, [r6, 0xD] - b _08012F50 -_08012EAE: - movs r0, 0x1D - strb r0, [r6, 0xC] - strb r1, [r6, 0xD] - b _08012F50 -_08012EB6: - adds r0, r6, 0 - adds r0, 0xD - ldr r1, =gUnknown_082EDD58 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - beq _08012F50 -_08012EC6: - movs r0, 0x17 - strb r0, [r6, 0xC] - b _08012F50 - .pool -_08012ED0: - bl sub_800E084 - bl sub_800EDD4 - adds r0, r6, 0 - bl sub_8012F64 - ldrb r0, [r6, 0xC] - adds r0, 0x1 - strb r0, [r6, 0xC] - b _08012F50 -_08012EE6: - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask - ldr r1, =gSpecialVar_Result - movs r0, 0x5 - strh r0, [r1] - b _08012F50 - .pool -_08012EFC: - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask - ldr r1, =gSpecialVar_Result - movs r0, 0x8 - strh r0, [r1] - b _08012F50 - .pool -_08012F14: - bl sub_8011A80 - cmp r0, 0 - beq _08012F22 - movs r0, 0x1D - strb r0, [r6, 0xC] - b _08012F50 -_08012F22: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _08012F50 - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - bl sub_80126CC - cmp r0, 0 - beq _08012F3A - bl sub_801103C -_08012F3A: - movs r0, 0x1 - bl sub_8011068 - bl sub_80149C4 - adds r0, r6, 0 - bl sub_8012F64 - adds r0, r4, 0 - bl DestroyTask -_08012F50: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8012780 - - thumb_func_start sub_8012F64 -sub_8012F64: @ 8012F64 - push {r4,lr} - adds r4, r0, 0 - ldrb r0, [r4, 0x11] - bl ClearWindowTilemap - ldrb r0, [r4, 0x11] - movs r1, 0 - bl sub_819746C - ldrb r0, [r4, 0x12] - movs r1, 0 - movs r2, 0 - bl DestroyListMenuTask - ldrb r0, [r4, 0x10] - bl ClearWindowTilemap - ldrb r0, [r4, 0xF] - movs r1, 0 - bl sub_819746C - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrb r0, [r4, 0x11] - bl RemoveWindow - ldrb r0, [r4, 0xF] - bl RemoveWindow - ldrb r0, [r4, 0x10] - bl RemoveWindow - ldrb r0, [r4, 0x17] - bl DestroyTask - ldr r0, [r4, 0x8] - bl Free - ldr r0, [r4] - bl Free - ldr r0, [r4, 0x4] - bl Free - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8012F64 - - thumb_func_start sub_8012FC4 -sub_8012FC4: @ 8012FC4 - push {lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r1, 24 - subs r0, r1, 0x1 - cmp r0, 0x1B - bhi _08013070 - lsls r0, 2 - ldr r1, =_08012FE0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08012FE0: - .4byte _08013050 - .4byte _08013050 - .4byte _08013068 - .4byte _08013050 - .4byte _08013070 - .4byte _08013070 - .4byte _08013070 - .4byte _08013070 - .4byte _08013068 - .4byte _08013068 - .4byte _08013068 - .4byte _08013070 - .4byte _08013070 - .4byte _08013050 - .4byte _08013068 - .4byte _08013068 - .4byte _08013070 - .4byte _08013070 - .4byte _08013070 - .4byte _08013070 - .4byte _08013058 - .4byte _08013058 - .4byte _08013068 - .4byte _08013068 - .4byte _08013068 - .4byte _08013068 - .4byte _08013068 - .4byte _08013050 -_08013050: - ldr r1, =gUnknown_082EDBE8 - b _0801305A - .pool -_08013058: - ldr r1, =gUnknown_082EDC0C -_0801305A: - adds r0, r2, 0 - bl StringExpandPlaceholders - b _08013070 - .pool -_08013068: - ldr r1, =gUnknown_082EDC34 - adds r0, r2, 0 - bl StringExpandPlaceholders -_08013070: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8012FC4 - - thumb_func_start sub_8013078 -sub_8013078: @ 8013078 - push {lr} - lsls r1, 24 - lsrs r1, 24 - adds r2, r1, 0 - cmp r1, 0x44 - beq _08013098 - cmp r1, 0x44 - bgt _0801308E - cmp r1, 0x41 - beq _08013098 - b _080130AA -_0801308E: - cmp r2, 0x45 - beq _080130A4 - cmp r2, 0x48 - beq _080130A4 - b _080130AA -_08013098: - ldr r1, =gUnknown_082EE560 - bl StringExpandPlaceholders - b _080130AA - .pool -_080130A4: - ldr r1, =gUnknown_082EE57C - bl StringExpandPlaceholders -_080130AA: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8013078 - - thumb_func_start sub_80130B4 -sub_80130B4: @ 80130B4 - push {lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r1, 24 - subs r0, r1, 0x1 - cmp r0, 0x1B - bhi _08013158 - lsls r0, 2 - ldr r1, =_080130D0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080130D0: - .4byte _08013140 - .4byte _08013140 - .4byte _08013150 - .4byte _08013140 - .4byte _08013158 - .4byte _08013158 - .4byte _08013158 - .4byte _08013158 - .4byte _08013150 - .4byte _08013150 - .4byte _08013150 - .4byte _08013158 - .4byte _08013158 - .4byte _08013140 - .4byte _08013150 - .4byte _08013150 - .4byte _08013158 - .4byte _08013158 - .4byte _08013158 - .4byte _08013158 - .4byte _08013140 - .4byte _08013140 - .4byte _08013150 - .4byte _08013150 - .4byte _08013150 - .4byte _08013150 - .4byte _08013150 - .4byte _08013140 -_08013140: - ldr r1, =gUnknown_082EFC3C - adds r0, r2, 0 - bl StringExpandPlaceholders - b _08013158 - .pool -_08013150: - ldr r1, =gUnknown_082EFC54 - adds r0, r2, 0 - bl StringExpandPlaceholders -_08013158: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80130B4 - - thumb_func_start sub_8013160 -sub_8013160: @ 8013160 - push {lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r1, 24 - subs r0, r1, 0x1 - cmp r0, 0x1B - bhi _08013204 - lsls r0, 2 - ldr r1, =_0801317C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0801317C: - .4byte _080131EC - .4byte _080131EC - .4byte _080131FC - .4byte _080131EC - .4byte _08013204 - .4byte _08013204 - .4byte _08013204 - .4byte _08013204 - .4byte _080131FC - .4byte _080131FC - .4byte _080131FC - .4byte _08013204 - .4byte _08013204 - .4byte _080131EC - .4byte _080131FC - .4byte _080131FC - .4byte _08013204 - .4byte _08013204 - .4byte _08013204 - .4byte _08013204 - .4byte _080131EC - .4byte _080131EC - .4byte _080131FC - .4byte _080131FC - .4byte _080131FC - .4byte _080131FC - .4byte _080131FC - .4byte _080131EC -_080131EC: - ldr r1, =gUnknown_082EDDF4 - adds r0, r2, 0 - bl StringExpandPlaceholders - b _08013204 - .pool -_080131FC: - ldr r1, =gUnknown_082EDE0C - adds r0, r2, 0 - bl StringExpandPlaceholders -_08013204: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8013160 - - thumb_func_start sub_801320C -sub_801320C: @ 801320C - push {r4-r6,lr} - adds r4, r0, 0 - adds r6, r1, 0 - adds r5, r2, 0 - ldr r0, [r4] - bl sub_80132D4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08013228 - cmp r0, 0x2 - beq _0801325C - b _08013270 -_08013228: - movs r0, 0x2 - bl PlaySE - ldrb r0, [r4, 0x12] - bl sub_81AE70C - ldr r0, =gStringVar2 - ldrb r2, [r4, 0x13] - lsls r2, 5 - ldr r1, [r4] - adds r1, r2 - bl sub_8018404 - ldr r0, =gStringVar4 - ldr r1, =gUnknown_02022C2C - ldrb r1, [r1] - bl sub_8012FC4 - strb r6, [r4, 0xC] - b _08013270 - .pool -_0801325C: - movs r0, 0 - movs r1, 0 - bl sub_8011A64 - ldrb r0, [r4, 0x12] - bl sub_81AE70C - strb r5, [r4, 0xC] - movs r0, 0x1 - b _08013272 -_08013270: - movs r0, 0 -_08013272: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_801320C - - thumb_func_start sub_8013278 -sub_8013278: @ 8013278 - push {r4-r6,lr} - sub sp, 0x8 - adds r4, r1, 0 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r2, 24 - lsrs r6, r2, 24 - ldr r0, =gUnknown_02022C30 - ldr r3, [r0] - movs r2, 0 - ldr r1, [r3] - lsls r0, r4, 5 - adds r1, r0 - ldrb r0, [r1, 0x1A] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - beq _080132A8 - cmp r0, 0x2 - beq _080132B2 - b _080132B4 - .pool -_080132A8: - ldrb r0, [r1, 0x1B] - cmp r0, 0 - beq _080132B4 - movs r2, 0x2 - b _080132B4 -_080132B2: - movs r2, 0x1 -_080132B4: - lsls r0, r4, 5 - ldr r3, [r3] - adds r3, r0 - str r2, [sp] - lsls r0, r4, 24 - lsrs r0, 24 - str r0, [sp, 0x4] - adds r0, r5, 0 - movs r1, 0 - adds r2, r6, 0 - bl sub_80178A0 - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8013278 - - thumb_func_start sub_80132D4 -sub_80132D4: @ 80132D4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - ldr r0, =gUnknown_02022C30 - ldr r5, [r0] - movs r0, 0 - mov r8, r0 - movs r3, 0x1 -_080132E8: - ldr r0, [r5] - lsls r6, r3, 5 - adds r2, r0, r6 - ldrb r0, [r2, 0x1A] - lsls r0, 30 - lsrs r0, 30 - mov r9, r0 - cmp r0, 0x1 - bne _08013348 - ldr r1, [r5, 0x4] - adds r0, r2, 0 - str r3, [sp] - bl sub_80176E4 - adds r4, r0, 0 - ldr r3, [sp] - cmp r4, 0xFF - beq _08013330 - ldr r1, [r5] - ldr r0, [r5, 0x4] - lsls r2, r4, 3 - subs r2, r4 - lsls r2, 2 - adds r1, r6 - adds r0, r2 - ldm r0!, {r2,r4,r7} - stm r1!, {r2,r4,r7} - ldm r0!, {r2,r4,r7} - stm r1!, {r2,r4,r7} - ldr r0, [r5] - adds r0, r6 - mov r1, r9 - strh r1, [r0, 0x18] - b _08013348 - .pool -_08013330: - ldr r2, [r5] - adds r2, r6 - ldrb r1, [r2, 0x1A] - movs r4, 0x4 - negs r4, r4 - adds r0, r4, 0 - ands r1, r0 - movs r0, 0x2 - orrs r1, r0 - strb r1, [r2, 0x1A] - movs r7, 0x2 - mov r8, r7 -_08013348: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x4 - bls _080132E8 - movs r6, 0 - movs r4, 0x3 -_08013356: - ldr r0, [r5] - ldr r1, [r5, 0x4] - adds r1, r6 - movs r2, 0x5 - bl sub_8017734 - adds r6, 0x1C - subs r4, 0x1 - ldr r0, [r5] - cmp r4, 0 - bge _08013356 - mov r1, r8 - cmp r1, 0x2 - beq _08013388 - adds r1, r0, 0 - movs r4, 0x4 -_08013376: - ldrb r0, [r1, 0x1B] - cmp r0, 0 - beq _08013380 - movs r2, 0x1 - mov r8, r2 -_08013380: - adds r1, 0x20 - subs r4, 0x1 - cmp r4, 0 - bge _08013376 -_08013388: - mov r0, r8 - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80132D4 - - thumb_func_start sub_8013398 -sub_8013398: @ 8013398 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, =gUnknown_02022C30 - ldr r4, [r0] - movs r3, 0 -_080133A8: - ldr r0, [r4, 0x8] - lsls r2, r3, 5 - ldr r1, [r4] - adds r0, r2 - adds r1, r2 - ldm r1!, {r2,r5,r6} - stm r0!, {r2,r5,r6} - ldm r1!, {r2,r5,r7} - stm r0!, {r2,r5,r7} - ldm r1!, {r6,r7} - stm r0!, {r6,r7} - adds r3, 0x1 - ldr r0, [r4, 0x8] - ldr r1, [r4] - cmp r3, 0x4 - ble _080133A8 - movs r5, 0 - mov r8, r1 - mov r9, r0 - movs r3, 0x4 -_080133D0: - mov r1, r9 - ldrb r0, [r1, 0x1A] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _080133F2 - lsls r0, r5, 5 - add r0, r8 - ldm r1!, {r2,r6,r7} - stm r0!, {r2,r6,r7} - ldm r1!, {r2,r6,r7} - stm r0!, {r2,r6,r7} - ldm r1!, {r2,r6} - stm r0!, {r2,r6} - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_080133F2: - movs r7, 0x20 - add r9, r7 - subs r3, 0x1 - cmp r3, 0 - bge _080133D0 - mov r10, r5 - cmp r5, 0x4 - bhi _08013454 - ldr r0, =gUnknown_082F045C - mov r9, r0 - movs r1, 0 - mov r12, r1 - movs r2, 0x4 - negs r2, r2 - mov r8, r2 -_08013410: - ldr r1, [r4] - lsls r3, r5, 5 - adds r1, r3 - mov r0, r9 - ldm r0!, {r2,r6,r7} - stm r1!, {r2,r6,r7} - ldm r0!, {r2,r6,r7} - stm r1!, {r2,r6,r7} - ldr r0, [r4] - adds r0, r3 - movs r1, 0 - strh r1, [r0, 0x18] - ldr r1, [r4] - adds r1, r3 - ldrb r2, [r1, 0x1A] - mov r0, r8 - ands r0, r2 - strb r0, [r1, 0x1A] - ldr r1, [r4] - adds r1, r3 - ldrb r2, [r1, 0x1A] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x1A] - ldr r0, [r4] - adds r0, r3 - mov r6, r12 - strb r6, [r0, 0x1B] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x4 - bls _08013410 -_08013454: - movs r3, 0 - ldr r1, [r4] - ldrb r0, [r1, 0x1A] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _08013474 - ldrb r0, [r1, 0x1B] - cmp r0, 0x40 - bne _08013474 - mov r10, r3 - b _08013494 - .pool -_08013474: - adds r3, 0x1 - cmp r3, 0x4 - bgt _08013494 - lsls r0, r3, 5 - adds r2, r1, r0 - ldrb r0, [r2, 0x1A] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _08013474 - ldrb r0, [r2, 0x1B] - cmp r0, 0x40 - bne _08013474 - lsls r0, r3, 24 - lsrs r0, 24 - mov r10, r0 -_08013494: - mov r0, r10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8013398 - - thumb_func_start BerryBlenderLinkJoinGroup -BerryBlenderLinkJoinGroup: @ 80134A4 - push {lr} - ldr r0, =sub_80134E8 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gUnknown_02022C30 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r1, r0 - str r1, [r2] - ldr r0, =gUnknown_03000DA4 - str r1, [r0] - movs r0, 0 - strb r0, [r1, 0x8] - strb r0, [r1, 0x9] - ldr r1, =gSpecialVar_Result - strh r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end BerryBlenderLinkJoinGroup - - thumb_func_start sub_80134E8 -sub_80134E8: @ 80134E8 - push {r4-r7,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gUnknown_02022C30 - ldr r6, [r0] - ldrb r0, [r6, 0x8] - cmp r0, 0x17 - bls _080134FC - b _08013B82 -_080134FC: - lsls r0, 2 - ldr r1, =_08013510 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08013510: - .4byte _08013570 - .4byte _080135E0 - .4byte _0801360C - .4byte _080136D8 - .4byte _08013B82 - .4byte _08013788 - .4byte _080137C4 - .4byte _08013A10 - .4byte _08013A2C - .4byte _08013A7A - .4byte _08013A8C - .4byte _08013B14 - .4byte _08013A8C - .4byte _08013AE4 - .4byte _08013A8C - .4byte _08013B24 - .4byte _08013B82 - .4byte _08013B82 - .4byte _08013A8C - .4byte _08013B44 - .4byte _08013A8C - .4byte _08013B78 - .4byte _08013B82 - .4byte _08013B68 -_08013570: - ldr r0, =gSpecialVar_0x8004 - ldrh r2, [r0] - adds r3, r0, 0 - cmp r2, 0x14 - bne _08013590 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000ca9 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _08013590 - adds r0, r2, 0x1 - strh r0, [r3] -_08013590: - ldr r2, =gUnknown_02022C2C - ldr r1, =gUnknown_082F0530 - ldrh r0, [r3] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - ldrb r0, [r2] - movs r1, 0 - movs r2, 0 - bl sub_8010F84 - bl sub_800B488 - bl OpenLink - bl sub_8011C5C - movs r0, 0x70 - bl AllocZeroed - str r0, [r6, 0x4] - movs r0, 0x80 - lsls r0, 2 - bl AllocZeroed - str r0, [r6] - movs r0, 0x1 - strb r0, [r6, 0x8] - b _08013B82 - .pool -_080135E0: - adds r0, r6, 0 - adds r0, 0x9 - ldr r2, =gUnknown_082EFB70 - ldr r1, =gSpecialVar_0x8004 - ldrh r1, [r1] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _080135FC - b _08013B82 -_080135FC: - movs r0, 0x2 - strb r0, [r6, 0x8] - b _08013B82 - .pool -_0801360C: - ldr r0, [r6, 0x4] - movs r1, 0x4 - bl sub_80175EC - ldr r0, [r6] - movs r1, 0x10 - bl sub_8017580 - ldr r0, [r6, 0x4] - ldr r1, =gSpecialVar_0x8004 - ldrh r1, [r1] - bl sub_8016FC0 - movs r4, 0 - strb r0, [r6, 0x11] - ldr r0, =gUnknown_082F00BC - bl AddWindow - strb r0, [r6, 0xC] - ldr r0, =gUnknown_082F0174 - bl AddWindow - strb r0, [r6, 0xB] - ldr r0, =gUnknown_082F017C - bl AddWindow - strb r0, [r6, 0xD] - ldrb r0, [r6, 0xC] - movs r1, 0x22 - bl FillWindowPixelBuffer - ldrb r0, [r6, 0xC] - ldr r2, =gUnknown_082EF7DC - movs r1, 0x1 - str r1, [sp] - movs r1, 0x4 - str r1, [sp, 0x4] - movs r1, 0 - movs r3, 0x8 - bl sub_80173E0 - ldrb r0, [r6, 0xC] - bl PutWindowTilemap - ldrb r0, [r6, 0xC] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r6, 0xB] - movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame - ldr r0, =gMultiuseListMenuTemplate - adds r2, r0, 0 - ldr r1, =gUnknown_082F0204 - ldm r1!, {r3,r5,r7} - stm r2!, {r3,r5,r7} - ldm r1!, {r3,r5,r7} - stm r2!, {r3,r5,r7} - ldrb r1, [r6, 0xB] - strb r1, [r0, 0x10] - movs r1, 0 - movs r2, 0 - bl ListMenuInit - strb r0, [r6, 0xE] - ldrb r0, [r6, 0xD] - movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame - ldrb r0, [r6, 0xD] - bl PutWindowTilemap - ldrb r0, [r6, 0xD] - bl sub_80125BC - ldrb r0, [r6, 0xD] - movs r1, 0x2 - bl CopyWindowToVram - movs r0, 0 - bl CopyBgTilemapBufferToVram - strb r4, [r6, 0xF] - movs r0, 0x3 - strb r0, [r6, 0x8] - b _08013B82 - .pool -_080136D8: - bl sub_8013E44 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - beq _080136F2 - cmp r4, 0x1 - beq _080136EA - b _08013A72 -_080136EA: - movs r0, 0x2 - bl PlaySE - b _08013A72 -_080136F2: - ldrb r0, [r6, 0xE] - bl ListMenuHandleInputGetItemId - adds r4, r0, 0 - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08013770 - movs r0, 0x1 - negs r0, r0 - cmp r4, r0 - beq _08013770 - ldr r0, [r6] - lsls r1, r4, 5 - adds r0, r1 - ldrb r1, [r0, 0xA] - ldrb r0, [r0, 0x1A] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _08013768 - lsrs r0, r1, 7 - cmp r0, 0 - bne _08013768 - adds r0, r6, 0 - adds r1, r4, 0 - bl sub_8013B8C - adds r1, r0, 0 - cmp r1, 0 - bne _08013744 - adds r0, r6, 0 - adds r1, r4, 0 - bl sub_8013BD8 - movs r0, 0x5 - b _08013756 - .pool -_08013744: - ldr r0, =gStringVar4 - ldr r2, =gUnknown_082EDD50 - subs r1, 0x1 - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - movs r0, 0x12 -_08013756: - strb r0, [r6, 0x8] - movs r0, 0x6E - bl PlaySE - b _08013B82 - .pool -_08013768: - movs r0, 0x7 - bl PlaySE - b _08013B82 -_08013770: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _0801377E - b _08013B82 -_0801377E: - movs r0, 0xA - strb r0, [r6, 0x8] - b _08013B82 - .pool -_08013788: - ldr r4, =gStringVar4 - ldr r0, =gUnknown_02022C2C - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_80130B4 - adds r0, r6, 0 - adds r0, 0x9 - adds r1, r4, 0 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _080137A6 - b _08013B82 -_080137A6: - ldr r0, =gStringVar1 - ldrb r2, [r6, 0xF] - lsls r2, 5 - ldr r1, [r6] - adds r1, r2 - bl sub_8018404 - b _08013A86 - .pool -_080137C4: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _0801387A - ldr r4, =gUnknown_02022C2C - ldr r1, [r6] - ldrb r0, [r6, 0xF] - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1, 0xA] - lsls r0, 25 - lsrs r0, 25 - strb r0, [r4] - movs r0, 0 - movs r1, 0 - bl sub_8011A64 - ldrb r0, [r4] - subs r0, 0x1 - cmp r0, 0x1B - bhi _0801387A - lsls r0, 2 - ldr r1, =_08013804 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08013804: - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _0801387A - .4byte _0801387A - .4byte _0801387A - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _0801387A - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _0801387A - .4byte _0801387A - .4byte _0801387A - .4byte _0801387A - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 - .4byte _08013874 -_08013874: - movs r0, 0x14 - strb r0, [r6, 0x8] - b _08013B82 -_0801387A: - bl sub_8011A74 - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - cmp r0, 0x8 - bls _0801388A - b _080139EC -_0801388A: - lsls r0, 2 - ldr r1, =_08013898 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08013898: - .4byte _080138BC - .4byte _080138C2 - .4byte _080139EC - .4byte _080139EC - .4byte _080138C8 - .4byte _080138C2 - .4byte _08013934 - .4byte _080139EC - .4byte _080138C2 -_080138BC: - movs r0, 0xC - strb r0, [r6, 0x8] - b _080139EC -_080138C2: - movs r0, 0xE - strb r0, [r6, 0x8] - b _080139EC -_080138C8: - ldr r5, =gStringVar4 - ldr r4, =gUnknown_02022C2C - ldrb r1, [r4] - adds r0, r5, 0 - bl sub_8013160 - adds r0, r6, 0 - adds r0, 0x9 - adds r1, r5, 0 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _080138E6 - b _080139EC -_080138E6: - ldrb r0, [r4] - cmp r0, 0x1C - beq _080138F0 - cmp r0, 0xE - bne _08013904 -_080138F0: - movs r0, 0xC - movs r1, 0 - bl sub_8011A64 - b _080139EC - .pool -_08013904: - movs r0, 0x7 - movs r1, 0 - bl sub_8011A64 - ldr r0, =gStringVar1 - ldr r2, =gUnknown_082F0048 - ldrb r1, [r4] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - ldr r1, =gUnknown_082EDE48 - adds r0, r5, 0 - bl StringExpandPlaceholders - b _080139EC - .pool -_08013934: - ldrb r0, [r6, 0x15] - adds r2, r0, 0 - cmp r2, 0xF0 - bls _0801395C - adds r0, r6, 0 - adds r0, 0x9 - ldr r1, =gStringVar4 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - beq _080139EC - movs r0, 0xC - movs r1, 0 - bl sub_8011A64 - movs r0, 0 - b _080139EA - .pool -_0801395C: - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - subs r0, 0x1 - cmp r0, 0x1B - bhi _080139E8 - lsls r0, 2 - ldr r1, =_08013978 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08013978: - .4byte _080139EC - .4byte _080139EC - .4byte _080139E8 - .4byte _080139EC - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139EC - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139E8 - .4byte _080139EC -_080139E8: - adds r0, r2, 0x1 -_080139EA: - strb r0, [r6, 0x15] -_080139EC: - bl sub_8011A74 - lsls r0, 24 - cmp r0, 0 - beq _080139F8 - b _08013B82 -_080139F8: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08013A06 - b _08013B82 -_08013A06: - movs r0, 0x7 - strb r0, [r6, 0x8] - b _08013B82 - .pool -_08013A10: - adds r0, r6, 0 - adds r0, 0x9 - ldr r1, =gUnknown_082EDE64 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - bne _08013A22 - b _08013B82 -_08013A22: - movs r0, 0x8 - strb r0, [r6, 0x8] - b _08013B82 - .pool -_08013A2C: - adds r4, r6, 0 - adds r4, 0x9 - bl sub_8011A74 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08013A6A - cmp r1, r0 - bgt _08013A58 - subs r0, 0x2 - cmp r1, r0 - beq _08013A6E - b _08013B82 -_08013A58: - cmp r1, 0 - beq _08013A62 - cmp r1, 0x1 - beq _08013A6A - b _08013B82 -_08013A62: - bl sub_80106D4 - movs r0, 0x9 - b _08013A70 -_08013A6A: - movs r0, 0x5 - b _08013A70 -_08013A6E: - movs r0, 0x6 -_08013A70: - strb r0, [r6, 0x8] -_08013A72: - ldrb r0, [r6, 0xE] - bl sub_81AE70C - b _08013B82 -_08013A7A: - bl sub_8011A74 - lsls r0, 24 - cmp r0, 0 - bne _08013A86 - b _08013B82 -_08013A86: - movs r0, 0x6 - strb r0, [r6, 0x8] - b _08013B82 -_08013A8C: - ldrb r0, [r6, 0xD] - bl ClearWindowTilemap - ldrb r0, [r6, 0xD] - movs r1, 0 - bl sub_819746C - ldrb r0, [r6, 0xE] - movs r1, 0 - movs r2, 0 - bl DestroyListMenuTask - ldrb r0, [r6, 0xC] - bl ClearWindowTilemap - ldrb r0, [r6, 0xB] - movs r1, 0 - bl sub_819746C - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrb r0, [r6, 0xD] - bl RemoveWindow - ldrb r0, [r6, 0xB] - bl RemoveWindow - ldrb r0, [r6, 0xC] - bl RemoveWindow - ldrb r0, [r6, 0x11] - bl DestroyTask - ldr r0, [r6] - bl Free - ldr r0, [r6, 0x4] - bl Free - ldrb r0, [r6, 0x8] - adds r0, 0x1 - strb r0, [r6, 0x8] - b _08013B82 -_08013AE4: - bl sub_800E084 - adds r5, r6, 0 - adds r5, 0x9 - ldr r4, =gUnknown_082EDE9C - bl sub_8011A74 - lsls r0, 24 - lsrs r0, 22 - adds r0, r4 - ldr r1, [r0] - adds r0, r5, 0 - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - beq _08013B82 - ldr r0, =gSpecialVar_Result - movs r1, 0x6 - b _08013B58 - .pool -_08013B14: - bl sub_800E084 - ldr r0, =gSpecialVar_Result - movs r1, 0x5 - b _08013B58 - .pool -_08013B24: - bl sub_800E084 - adds r5, r6, 0 - adds r5, 0x9 - ldr r4, =gUnknown_082EDE9C - bl sub_8011A74 - lsls r0, 24 - lsrs r0, 22 - adds r0, r4 - ldr r1, [r0] - adds r0, r5, 0 - b _08013B4A - .pool -_08013B44: - adds r0, r6, 0 - adds r0, 0x9 - ldr r1, =gStringVar4 -_08013B4A: - bl sub_8017064 - lsls r0, 24 - cmp r0, 0 - beq _08013B82 - ldr r0, =gSpecialVar_Result - movs r1, 0x8 -_08013B58: - strh r1, [r0] - movs r0, 0x17 - strb r0, [r6, 0x8] - b _08013B82 - .pool -_08013B68: - adds r0, r4, 0 - bl DestroyTask - bl sub_80173D4 - bl sub_800EDD4 - b _08013B82 -_08013B78: - bl sub_80149C4 - adds r0, r4, 0 - bl DestroyTask -_08013B82: - add sp, 0x8 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80134E8 - thumb_func_start sub_8013B8C sub_8013B8C: @ 8013B8C push {lr} @@ -5839,7 +3639,7 @@ _08015D4C: adds r1, r2 adds r1, r3 ldr r1, [r1] - bl sub_8017064 + bl PrintOnTextbox lsls r0, 24 cmp r0, 0 bne _08015D8C @@ -5951,7 +3751,7 @@ _08015E94: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gStringVar4 - bl sub_8017064 + bl PrintOnTextbox lsls r0, 24 cmp r0, 0 bne _08015EA8 @@ -6247,7 +4047,7 @@ _08016158: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gStringVar4 - bl sub_8017064 + bl PrintOnTextbox lsls r0, 24 cmp r0, 0 bne _08016170 @@ -6565,7 +4365,7 @@ _0801645C: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gUnknown_082EF20C - bl sub_8017064 + bl PrintOnTextbox lsls r0, 24 cmp r0, 0 bne _0801646E @@ -6734,7 +4534,7 @@ _080165DC: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gUnknown_082EF5B8 - bl sub_8017064 + bl PrintOnTextbox lsls r0, 24 cmp r0, 0 bne _080165EE @@ -6755,7 +4555,7 @@ _08016610: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gUnknown_082EF1EC - bl sub_8017064 + bl PrintOnTextbox lsls r0, 24 cmp r0, 0 bne _08016622 @@ -6906,7 +4706,7 @@ _0801676C: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gUnknown_082EF4C4 - bl sub_8017064 + bl PrintOnTextbox lsls r0, 24 cmp r0, 0 bne _0801677E @@ -6984,7 +4784,7 @@ _08016838: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gStringVar4 - bl sub_8017064 + bl PrintOnTextbox lsls r0, 24 cmp r0, 0 beq _08016878 @@ -7003,7 +4803,7 @@ _08016864: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gStringVar4 - bl sub_8017064 + bl PrintOnTextbox lsls r0, 24 cmp r0, 0 beq _08016878 @@ -8021,8 +5821,8 @@ _0801705E: bx r1 thumb_func_end sub_801704C - thumb_func_start sub_8017064 -sub_8017064: @ 8017064 + thumb_func_start PrintOnTextbox +PrintOnTextbox: @ 8017064 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -8062,7 +5862,7 @@ _080170B0: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8017064 + thumb_func_end PrintOnTextbox thumb_func_start sub_80170B8 sub_80170B8: @ 80170B8 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index a6a0ebcc2..08af093ef 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1761,7 +1761,7 @@ LilycoveCity_ContestLobby_Text_27C186: @ 827C186 LilycoveCity_ContestLobby_Text_27C1C3: @ 827C1C3 .string "Which POKéMON would you like to enter?$" -LilycoveCity_ContestLobby_Text_27C1EA: @ 827C1EA +Text_DecideLinkLeader: @ 827C1EA .string "Please decide which of you will\n" .string "become the GROUP LEADER.\p" .string "The other players must then choose\n" diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1c4d21970..0db441592 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -877,7 +877,7 @@ LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0 return LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 - message LilycoveCity_ContestLobby_Text_27C1EA + message Text_DecideLinkLeader waitmessage multichoice 16, 6, 81, 0 switch VAR_RESULT diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 39cca8244..81a83c857 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,22 +1,36 @@ -LilycoveCity_ContestLobby_Text_292DEE: @ 8292DEE +@ The scripts there concern pokeblock events in LilyCove City's Contest Lobby + +@ 'PblockX' number of offline opponents +@ 'Ask' talking with a blender machine +@ 'Yes' agreeing to blend +@ 'No' refusing to blend +@ 'KnowHow' asking if the player knows the blending process +@ 'Explain' explaining the blender process +@ 'Start' start blending +@ 'TalkX' talking with a person next to a blender machine +@ 'NoBerries' can't blend cause they have no berries +@ 'FullPokeblock' can't blend cause full pokeblock case +@ 'NoPokeblock' can't blend cause they have no pokeblock case + +Text_Pblock1_Ask: @ 8292DEE .string "Oh? Did you want to make some {POKEBLOCK}S\n" .string "with this old-timer?$" -LilycoveCity_ContestLobby_Text_292E28: @ 8292E28 +Text_Pblock1_Yes: @ 8292E28 .string "Excellent!$" -LilycoveCity_ContestLobby_Text_292E33: @ 8292E33 +Text_Pblock1_No: @ 8292E33 .string "Oh…\n" .string "You’ve made this old-timer sad…$" -LilycoveCity_ContestLobby_Text_292E57: @ 8292E57 +Text_Pblock1_KnowHow: @ 8292E57 .string "Do you know how to make a {POKEBLOCK}?$" -LilycoveCity_ContestLobby_Text_292E78: @ 8292E78 +Text_Pblock1_Start: @ 8292E78 .string "Let’s get started, then!\p" .string "Let’s BERRY BLENDER!$" -LilycoveCity_ContestLobby_Text_292EA6: @ 8292EA6 +Text_Pblock1_Explain: @ 8292EA6 .string "Okay, a little explanation, then.\p" .string "Oh, don’t worry, it’s quite simple.\p" .string "When the BLENDER’s arrow comes to\n" @@ -24,7 +38,7 @@ LilycoveCity_ContestLobby_Text_292EA6: @ 8292EA6 .string "That’s all you have to do.\n" .string "You’ll see how easy it is when you try.$" -LilycoveCity_ContestLobby_Text_292F77: @ 8292F77 +Text_Pblock1_NoBerries: @ 8292F77 .string "Oh?\n" .string "You don’t have any BERRIES?\p" .string "If you don’t have any BERRIES,\n" @@ -43,12 +57,12 @@ LilycoveCity_ContestLobby_Text_29307D: @ 829307D .string "But, I don’t have any to spare today.\n" .string "We’ll have to do this another time.$" -LilycoveCity_ContestLobby_Text_293101: @ 8293101 +Text_Pblock1_FullPokeblock: @ 8293101 .string "But your {POKEBLOCK} CASE is full.\p" .string "You should use some {POKEBLOCK}S before\n" .string "you come see me again.$" -LilycoveCity_ContestLobby_Text_293157: @ 8293157 +Text_Pblock1_NoPokeblock: @ 8293157 .string "But you don’t have a {POKEBLOCK} CASE.\p" .string "You should get a {POKEBLOCK} CASE and then\n" .string "come see me.$" @@ -171,43 +185,43 @@ LilycoveCity_ContestLobby_Text_29388F: @ 829388F .string "I’m going to make delicious {POKEBLOCK}S\n" .string "and make my POKéMON cuter.$" -LilycoveCity_ContestLobby_Text_2938CD: @ 82938CD +Text_PblockLink_Ask: @ 82938CD .string "{POKEBLOCK}S will be made with your friends \n" .string "from BERRIES in the BERRY BLENDER.\p" .string "Is it okay to save the game before\n" .string "linking with your friends?$" -LilycoveCity_ContestLobby_Text_293955: @ 8293955 +Text_PblockLink_Searching: @ 8293955 .string "Searching for your friends…\n" .string "… … B Button: Cancel$" -LilycoveCity_ContestLobby_Text_293986: @ 8293986 +Text_PblockLink_1Arrived: @ 8293986 .string "{STR_VAR_1} arrived.$" -LilycoveCity_ContestLobby_Text_293992: @ 8293992 +Text_PblockLink_2Arrived: @ 8293992 .string "{STR_VAR_1} and {STR_VAR_2} arrived.$" -LilycoveCity_ContestLobby_Text_2939A5: @ 82939A5 +Text_PblockLink_3Arrived: @ 82939A5 .string "{STR_VAR_1}, {STR_VAR_2}, and\n" .string "{STR_VAR_3} arrived.$" -LilycoveCity_ContestLobby_Text_2939BD: @ 82939BD +Text_PblockLink_NoBerries: @ 82939BD .string "You have no BERRIES.\n" .string "The BERRY BLENDER can’t be used.$" -LilycoveCity_ContestLobby_Text_2939F3: @ 82939F3 +Text_PblockLink_FullPokeblock: @ 82939F3 .string "Your {POKEBLOCK} CASE is full.\n" .string "The BERRY BLENDER can’t be used.$" -LilycoveCity_ContestLobby_Text_293A2D: @ 8293A2D +Text_PblockLink_NoPokeblock: @ 8293A2D .string "You don’t have a {POKEBLOCK} CASE.\n" .string "The BERRY BLENDER can’t be used.$" -LilycoveCity_ContestLobby_Text_293A6B: @ 8293A6B +Text_Pblock1_Talk_0: @ 8293A6B .string "I love making {POKEBLOCK}S.\p" .string "I always have some BERRIES with me.$" -LilycoveCity_ContestLobby_Text_293AA5: @ 8293AA5 +Text_Pblock1_Talk_1: @ 8293AA5 .string "If you’d like, we could make some\n" .string "{POKEBLOCK}S together using the\l" .string "BERRY BLENDER.$" @@ -231,76 +245,76 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4 .string "But, I don’t have any to spare today.\n" .string "Sorry about that.$" -LilycoveCity_ContestLobby_EventScript_293C3E:: @ 8293C3E +EventScript_Pblock1_Ask: @ 8293C3E lockall checkflag FLAG_0x340 goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB setvar VAR_0x8009, 1 applymovement 16, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_292DEE, 5 + msgbox Text_Pblock1_Ask, 5 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293CEE - goto LilycoveCity_ContestLobby_EventScript_293C70 + goto_eq EventScript_Pblock1_Yes + goto EventScript_Pblock1_No end -LilycoveCity_ContestLobby_EventScript_293C70:: @ 8293C70 - msgbox LilycoveCity_ContestLobby_Text_292E33, 4 +EventScript_Pblock1_No: @ 8293C70 + msgbox Text_Pblock1_No, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293C7A:: @ 8293C7A - msgbox LilycoveCity_ContestLobby_Text_292F77, 4 +EventScript_Pblock1_NoBerries: @ 8293C7A + msgbox Text_Pblock1_NoBerries, 4 dodailyevents checkflag FLAG_0x921 goto_eq LilycoveCity_ContestLobby_EventScript_293C92 goto LilycoveCity_ContestLobby_EventScript_293C9C end -LilycoveCity_ContestLobby_EventScript_293C92:: @ 8293C92 +LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92 msgbox LilycoveCity_ContestLobby_Text_29307D, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293C9C:: @ 8293C9C +LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C msgbox LilycoveCity_ContestLobby_Text_292FD1, 4 giveitem_std ITEM_PECHA_BERRY setflag FLAG_0x921 - goto LilycoveCity_ContestLobby_EventScript_293CB9 + goto EventScript_Pblock1_KnowHow end -LilycoveCity_ContestLobby_EventScript_293CB9:: @ 8293CB9 - msgbox LilycoveCity_ContestLobby_Text_292E57, 5 +EventScript_Pblock1_KnowHow: @ 8293CB9 + msgbox Text_Pblock1_KnowHow, 5 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293CD2 - goto LilycoveCity_ContestLobby_EventScript_293CE0 + goto_eq EventScript_Pblock1_Start + goto EventScript_Pblock1_Explain end -LilycoveCity_ContestLobby_EventScript_293CD2:: @ 8293CD2 - msgbox LilycoveCity_ContestLobby_Text_292E78, 4 - goto LilycoveCity_ContestLobby_EventScript_293D2C +EventScript_Pblock1_Start: @ 8293CD2 + msgbox Text_Pblock1_Start, 4 + goto EventScript_StartBlending end -LilycoveCity_ContestLobby_EventScript_293CE0:: @ 8293CE0 - msgbox LilycoveCity_ContestLobby_Text_292EA6, 4 - goto LilycoveCity_ContestLobby_EventScript_293CD2 +EventScript_Pblock1_Explain: @ 8293CE0 + msgbox Text_Pblock1_Explain, 4 + goto EventScript_Pblock1_Start end -LilycoveCity_ContestLobby_EventScript_293CEE:: @ 8293CEE +EventScript_Pblock1_Yes: @ 8293CEE checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293D43 + goto_eq EventScript_Pblock1_NoPokeblock specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_293D39 + goto_eq EventScript_Pblock1_FullPokeblock specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293C7A - msgbox LilycoveCity_ContestLobby_Text_292E28, 4 - goto LilycoveCity_ContestLobby_EventScript_293CB9 + goto_eq EventScript_Pblock1_NoBerries + msgbox Text_Pblock1_Yes, 4 + goto EventScript_Pblock1_KnowHow end -LilycoveCity_ContestLobby_EventScript_293D2C:: @ 8293D2C +EventScript_StartBlending: @ 8293D2C copyvar VAR_0x8004, VAR_0x8009 fadescreen 1 special DoBerryBlending @@ -308,17 +322,17 @@ LilycoveCity_ContestLobby_EventScript_293D2C:: @ 8293D2C releaseall end -LilycoveCity_ContestLobby_EventScript_293D39:: @ 8293D39 - msgbox LilycoveCity_ContestLobby_Text_293101, 4 +EventScript_Pblock1_FullPokeblock: @ 8293D39 + msgbox Text_Pblock1_FullPokeblock, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293D43:: @ 8293D43 - msgbox LilycoveCity_ContestLobby_Text_293157, 4 +EventScript_Pblock1_NoPokeblock: @ 8293D43 + msgbox Text_Pblock1_NoPokeblock, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D +LilycoveCity_ContestLobby_EventScript_293D4D: @ 8293D4D lockall setvar VAR_0x8009, 2 applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2 @@ -330,34 +344,34 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D goto LilycoveCity_ContestLobby_EventScript_293D7D end -LilycoveCity_ContestLobby_EventScript_293D7D:: @ 8293D7D +LilycoveCity_ContestLobby_EventScript_293D7D: @ 8293D7D msgbox LilycoveCity_ContestLobby_Text_29323D, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293D87:: @ 8293D87 +LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87 msgbox LilycoveCity_ContestLobby_Text_293394, 4 release end -LilycoveCity_ContestLobby_EventScript_293D91:: @ 8293D91 +LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91 msgbox LilycoveCity_ContestLobby_Text_29328C, 5 compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293DAA goto LilycoveCity_ContestLobby_EventScript_293DB8 end -LilycoveCity_ContestLobby_EventScript_293DAA:: @ 8293DAA +LilycoveCity_ContestLobby_EventScript_293DAA: @ 8293DAA msgbox LilycoveCity_ContestLobby_Text_2932C3, 4 - goto LilycoveCity_ContestLobby_EventScript_293D2C + goto EventScript_StartBlending end -LilycoveCity_ContestLobby_EventScript_293DB8:: @ 8293DB8 +LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8 msgbox LilycoveCity_ContestLobby_Text_2932F1, 4 goto LilycoveCity_ContestLobby_EventScript_293DAA end -LilycoveCity_ContestLobby_EventScript_293DC6:: @ 8293DC6 +LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293D87 @@ -372,17 +386,17 @@ LilycoveCity_ContestLobby_EventScript_293DC6:: @ 8293DC6 goto_eq LilycoveCity_ContestLobby_EventScript_293E0A end -LilycoveCity_ContestLobby_EventScript_293E0A:: @ 8293E0A +LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A msgbox LilycoveCity_ContestLobby_Text_29343E, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293E14:: @ 8293E14 +LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14 msgbox LilycoveCity_ContestLobby_Text_2934A2, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E +LilycoveCity_ContestLobby_EventScript_293E1E: @ 8293E1E lockall setvar VAR_0x8008, 15 setvar VAR_0x8009, 3 @@ -396,34 +410,34 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E goto LilycoveCity_ContestLobby_EventScript_293E5A end -LilycoveCity_ContestLobby_EventScript_293E5A:: @ 8293E5A +LilycoveCity_ContestLobby_EventScript_293E5A: @ 8293E5A msgbox LilycoveCity_ContestLobby_Text_293558, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293E64:: @ 8293E64 +LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64 msgbox LilycoveCity_ContestLobby_Text_29367D, 4 release end -LilycoveCity_ContestLobby_EventScript_293E6E:: @ 8293E6E +LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E msgbox LilycoveCity_ContestLobby_Text_29357E, 5 compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293E87 goto LilycoveCity_ContestLobby_EventScript_293E95 end -LilycoveCity_ContestLobby_EventScript_293E87:: @ 8293E87 +LilycoveCity_ContestLobby_EventScript_293E87: @ 8293E87 msgbox LilycoveCity_ContestLobby_Text_2935B1, 4 - goto LilycoveCity_ContestLobby_EventScript_293D2C + goto EventScript_StartBlending end -LilycoveCity_ContestLobby_EventScript_293E95:: @ 8293E95 +LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95 msgbox LilycoveCity_ContestLobby_Text_2935E5, 4 goto LilycoveCity_ContestLobby_EventScript_293E87 end -LilycoveCity_ContestLobby_EventScript_293EA3:: @ 8293EA3 +LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293E64 @@ -438,17 +452,17 @@ LilycoveCity_ContestLobby_EventScript_293EA3:: @ 8293EA3 goto_eq LilycoveCity_ContestLobby_EventScript_293EE7 end -LilycoveCity_ContestLobby_EventScript_293EE7:: @ 8293EE7 +LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7 msgbox LilycoveCity_ContestLobby_Text_293738, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293EF1:: @ 8293EF1 +LilycoveCity_ContestLobby_EventScript_293EF1: @ 8293EF1 msgbox LilycoveCity_ContestLobby_Text_293792, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293EFB:: @ 8293EFB +LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB lockall setvar VAR_0x8009, 1 msgbox LilycoveCity_ContestLobby_Text_2C42F4, 5 @@ -458,12 +472,12 @@ LilycoveCity_ContestLobby_EventScript_293EFB:: @ 8293EFB releaseall end -LilycoveCity_ContestLobby_EventScript_293F1E:: @ 8293F1E +LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E msgbox LilycoveCity_ContestLobby_Text_2C439D, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293F28:: @ 8293F28 +LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293F8E @@ -477,49 +491,49 @@ LilycoveCity_ContestLobby_EventScript_293F28:: @ 8293F28 goto_eq LilycoveCity_ContestLobby_EventScript_293F98 end -LilycoveCity_ContestLobby_EventScript_293F64:: @ 8293F64 +LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64 msgbox LilycoveCity_ContestLobby_Text_2C43FA, 5 compare VAR_RESULT, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_293F85 msgbox LilycoveCity_ContestLobby_Text_2C451B, 4 - goto LilycoveCity_ContestLobby_EventScript_293D2C + goto EventScript_StartBlending end -LilycoveCity_ContestLobby_EventScript_293F85:: @ 8293F85 +LilycoveCity_ContestLobby_EventScript_293F85: @ 8293F85 msgbox LilycoveCity_ContestLobby_Text_2C444C, 4 return -LilycoveCity_ContestLobby_EventScript_293F8E:: @ 8293F8E +LilycoveCity_ContestLobby_EventScript_293F8E: @ 8293F8E msgbox LilycoveCity_ContestLobby_Text_2C4573, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293F98:: @ 8293F98 +LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98 msgbox LilycoveCity_ContestLobby_Text_2C45E8, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_293FA2:: @ 8293FA2 +LilycoveCity_ContestLobby_EventScript_293FA2: @ 8293FA2 msgbox LilycoveCity_ContestLobby_Text_2937F9, 2 end -LilycoveCity_ContestLobby_EventScript_293FAB:: @ 8293FAB +LilycoveCity_ContestLobby_EventScript_293FAB: @ 8293FAB msgbox LilycoveCity_ContestLobby_Text_293842, 2 end -LilycoveCity_ContestLobby_EventScript_293FB4:: @ 8293FB4 +LilycoveCity_ContestLobby_EventScript_293FB4: @ 8293FB4 msgbox LilycoveCity_ContestLobby_Text_29388F, 2 end -LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD +LilycoveCity_ContestLobby_EventScript_293FBD: @ 8293FBD setvar VAR_0x8008, 15 goto LilycoveCity_ContestLobby_EventScript_293FC8 end -LilycoveCity_ContestLobby_EventScript_293FC8:: @ 8293FC8 +LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_293A6B, 4 + msgbox Text_Pblock1_Talk_0, 4 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293FEE @@ -527,12 +541,12 @@ LilycoveCity_ContestLobby_EventScript_293FC8:: @ 8293FC8 goto_eq LilycoveCity_ContestLobby_EventScript_293FF8 end -LilycoveCity_ContestLobby_EventScript_293FEE:: @ 8293FEE - msgbox LilycoveCity_ContestLobby_Text_293AA5, 4 +LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE + msgbox Text_Pblock1_Talk_1, 4 release end -LilycoveCity_ContestLobby_EventScript_293FF8:: @ 8293FF8 +LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294028 @@ -545,12 +559,12 @@ LilycoveCity_ContestLobby_EventScript_293FF8:: @ 8293FF8 goto LilycoveCity_ContestLobby_EventScript_294032 end -LilycoveCity_ContestLobby_EventScript_294028:: @ 8294028 +LilycoveCity_ContestLobby_EventScript_294028: @ 8294028 msgbox LilycoveCity_ContestLobby_Text_293BB4, 4 release end -LilycoveCity_ContestLobby_EventScript_294032:: @ 8294032 +LilycoveCity_ContestLobby_EventScript_294032: @ 8294032 msgbox LilycoveCity_ContestLobby_Text_293AF0, 4 giveitem_std ITEM_PECHA_BERRY setflag FLAG_0x921 @@ -562,73 +576,73 @@ LilycoveCity_ContestLobby_Movement_294053: @ 8294053 step_28 step_end -LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055 +EventScript_PblockLink: @ 8294055 lockall specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_2940B1 + goto_eq EventScript_PblocLink_NoBerries checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_29416C + goto_eq EventScript_PblocLink_NoPokeblock specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if 5, LilycoveCity_ContestLobby_EventScript_294092 + goto_if 5, EventScript_PblocLink_Ask compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_294162 + goto_eq EventScript_PblocLink_FullPokeblock end -LilycoveCity_ContestLobby_EventScript_294092:: @ 8294092 - msgbox LilycoveCity_ContestLobby_Text_2938CD, 5 +EventScript_PblocLink_Ask: @ 8294092 + msgbox Text_PblockLink_Ask, 5 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_2940BB + goto_eq EventScript_PblocLink_TryConnect compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_294160 + goto_eq EventScript_PblocLink_End end -LilycoveCity_ContestLobby_EventScript_2940B1:: @ 82940B1 - msgbox LilycoveCity_ContestLobby_Text_2939BD, 4 +EventScript_PblocLink_NoBerries: @ 82940B1 + msgbox Text_PblockLink_NoBerries, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_2940BB:: @ 82940BB +EventScript_PblocLink_TryConnect: @ 82940BB call LilycoveCity_ContestLobby_EventScript_27134F compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_294160 + goto_eq EventScript_PblocLink_End specialvar VAR_RESULT, sub_80093CC compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2941ED - message LilycoveCity_ContestLobby_Text_293955 + message Text_PblockLink_Searching waitmessage special sub_80B2FD8 waitstate compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_2941AA + goto_eq EventScript_PblocLink_SpawnPartners compare VAR_RESULT, 2 - goto_eq LilycoveCity_ContestLobby_EventScript_294176 + goto_eq EventScript_PblocLink_SomeoneNotReady compare VAR_RESULT, 3 - goto_eq LilycoveCity_ContestLobby_EventScript_294183 + goto_eq EventScript_PblocLink_DifferentSelections compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_294190 + goto_eq EventScript_PblocLink_CloseLink compare VAR_RESULT, 6 - goto_eq LilycoveCity_ContestLobby_EventScript_29419D + goto_eq EventScript_PblocLink_LinkError end -LilycoveCity_ContestLobby_EventScript_29411D:: @ 829411D - msgbox LilycoveCity_ContestLobby_Text_293986, 4 - goto LilycoveCity_ContestLobby_EventScript_294147 +EventScript_PblocLink_1Arrived: @ 829411D + msgbox Text_PblockLink_1Arrived, 4 + goto EventScript_PblocLink_StartLinkBlending end -LilycoveCity_ContestLobby_EventScript_29412B:: @ 829412B - msgbox LilycoveCity_ContestLobby_Text_293992, 4 - goto LilycoveCity_ContestLobby_EventScript_294147 +EventScript_PblocLink_2Arrived: @ 829412B + msgbox Text_PblockLink_2Arrived, 4 + goto EventScript_PblocLink_StartLinkBlending end -LilycoveCity_ContestLobby_EventScript_294139:: @ 8294139 - msgbox LilycoveCity_ContestLobby_Text_2939A5, 4 - goto LilycoveCity_ContestLobby_EventScript_294147 +EventScript_PblocLink_3Arrived: @ 8294139 + msgbox Text_PblockLink_3Arrived, 4 + goto EventScript_PblocLink_StartLinkBlending end -LilycoveCity_ContestLobby_EventScript_294147:: @ 8294147 +EventScript_PblocLink_StartLinkBlending: @ 8294147 setvar VAR_0x8004, 0 fadescreen 1 removeobject 240 @@ -640,109 +654,109 @@ LilycoveCity_ContestLobby_EventScript_294147:: @ 8294147 releaseall end -LilycoveCity_ContestLobby_EventScript_294160:: @ 8294160 +EventScript_PblocLink_End: @ 8294160 releaseall end -LilycoveCity_ContestLobby_EventScript_294162:: @ 8294162 - msgbox LilycoveCity_ContestLobby_Text_2939F3, 4 +EventScript_PblocLink_FullPokeblock: @ 8294162 + msgbox Text_PblockLink_FullPokeblock, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_29416C:: @ 829416C - msgbox LilycoveCity_ContestLobby_Text_293A2D, 4 +EventScript_PblocLink_NoPokeblock: @ 829416C + msgbox Text_PblockLink_NoPokeblock, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_294176:: @ 8294176 +EventScript_PblocLink_SomeoneNotReady: @ 8294176 special CloseLink msgbox LilycoveCity_ContestLobby_Text_2781C7, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_294183:: @ 8294183 +EventScript_PblocLink_DifferentSelections: @ 8294183 special CloseLink msgbox LilycoveCity_ContestLobby_Text_278255, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_294190:: @ 8294190 +EventScript_PblocLink_CloseLink: @ 8294190 special CloseLink msgbox gUnknown_08272D9C, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D +EventScript_PblocLink_LinkError: @ 829419D special CloseLink msgbox LilycoveCity_ContestLobby_Text_27821C, 4 releaseall end -LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA +EventScript_PblocLink_SpawnPartners: @ 82941AA fadescreen 1 specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 special SpawnLinkPartnerFieldObject - goto LilycoveCity_ContestLobby_EventScript_2941C4 + goto EventScript_PblocLink_Arrived end -LilycoveCity_ContestLobby_EventScript_2941C4:: @ 82941C4 +EventScript_PblocLink_Arrived: @ 82941C4 fadescreen 0 switch VAR_0x8008 - case 2, LilycoveCity_ContestLobby_EventScript_29411D - case 3, LilycoveCity_ContestLobby_EventScript_29412B - case 4, LilycoveCity_ContestLobby_EventScript_294139 + case 2, EventScript_PblocLink_1Arrived + case 3, EventScript_PblocLink_2Arrived + case 4, EventScript_PblocLink_3Arrived end -LilycoveCity_ContestLobby_EventScript_2941ED:: @ 82941ED +LilycoveCity_ContestLobby_EventScript_2941ED: @ 82941ED setvar VAR_0x8004, 13 - goto LilycoveCity_ContestLobby_EventScript_2941F8 + goto EventScript_PblocLink_DecideLeader end -LilycoveCity_ContestLobby_EventScript_2941F8:: @ 82941F8 - message LilycoveCity_ContestLobby_Text_27C1EA +EventScript_PblocLink_DecideLeader: @ 82941F8 + message Text_DecideLinkLeader waitmessage multichoice 16, 6, 81, 0 switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_29425D - case 1, LilycoveCity_ContestLobby_EventScript_294235 - case 2, LilycoveCity_ContestLobby_EventScript_294190 - case 127, LilycoveCity_ContestLobby_EventScript_294190 + case 0, EventScript_PblocLink_TryJoinGroup + case 1, EventScript_PblocLink_TryBecomeLeader + case 2, EventScript_PblocLink_CloseLink + case 127, EventScript_PblocLink_CloseLink end -LilycoveCity_ContestLobby_EventScript_294235:: @ 8294235 - call LilycoveCity_ContestLobby_EventScript_294285 +EventScript_PblocLink_TryBecomeLeader: @ 8294235 + call EventScript_PblocLink_BecomeLeader compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_29428F + goto_eq EventScript_PblocLink_SpawnPartners_ compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_2941F8 + goto_eq EventScript_PblocLink_DecideLeader compare VAR_RESULT, 8 - goto_eq LilycoveCity_ContestLobby_EventScript_294235 + goto_eq EventScript_PblocLink_TryBecomeLeader release end -LilycoveCity_ContestLobby_EventScript_29425D:: @ 829425D - call LilycoveCity_ContestLobby_EventScript_29428A +EventScript_PblocLink_TryJoinGroup: @ 829425D + call EventScript_PblocLink_JoinGroup compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_29428F + goto_eq EventScript_PblocLink_SpawnPartners_ compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_2941F8 + goto_eq EventScript_PblocLink_DecideLeader compare VAR_RESULT, 8 - goto_eq LilycoveCity_ContestLobby_EventScript_29425D + goto_eq EventScript_PblocLink_TryJoinGroup release end -LilycoveCity_ContestLobby_EventScript_294285:: @ 8294285 +EventScript_PblocLink_BecomeLeader: @ 8294285 special BerryBlenderLinkBecomeLeader waitstate return -LilycoveCity_ContestLobby_EventScript_29428A:: @ 829428A +EventScript_PblocLink_JoinGroup: @ 829428A special BerryBlenderLinkJoinGroup waitstate return -LilycoveCity_ContestLobby_EventScript_29428F:: @ 829428F - goto LilycoveCity_ContestLobby_EventScript_2941AA +EventScript_PblocLink_SpawnPartners_: @ 829428F + goto EventScript_PblocLink_SpawnPartners end diff --git a/include/librfu.h b/include/librfu.h index aae7df4e9..2c4d091bd 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -200,8 +200,6 @@ extern struct RfuUnk1* gUnknown_03007870[4]; extern void* sub_82E53F4; extern void rfu_STC_clearAPIVariables(void); -struct UnkLinkRfuStruct_02022B14; - void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 copyInterruptToRam); void rfu_REQ_stopMode(void); void rfu_waitREQComplete(void); diff --git a/include/link_rfu.h b/include/link_rfu.h index ca39c2fb2..b517fba17 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -232,5 +232,21 @@ void sub_8011068(u8 a0); void sub_8011170(u32 a0); void sub_8011A64(u8 a0, u16 a1); u8 sub_801048C(bool32 a0); +void sub_800DF90(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2); +void sub_8010F84(u8 a0, u32 a1, u32 a2); +void sub_8011C10(u32 a0); +bool32 sub_8012240(void); +void sub_800EF38(void); +bool32 sub_80105EC(void); +bool32 sub_801064C(u16 a0, const u8 *a1); +void sub_8010688(u8 a0, u16 a1, const u8 *a2); +u32 sub_8010714(u16 a0, const u8 *a1); +void sub_8011DC0(const u8 *a0, u16 a1); +bool8 sub_800EF1C(void); +bool32 sub_800EF58(bool32 a0); +void sub_800E084(void); +void sub_801103C(void); +void sub_8011C5C(void); +void sub_80106D4(void); #endif //GUARD_LINK_RFU_H diff --git a/src/link_rfu.c b/src/link_rfu.c index 37aa20950..b539c31d6 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -2850,7 +2850,7 @@ void sub_800EF38(void) gUnknown_03005000.unk_ce7 = gUnknown_03004140.unk_00; } -bool8 sub_800EF58(bool32 a0) +bool32 sub_800EF58(bool32 a0) { if (gUnknown_03005000.unk_04 == 17 || a0) { @@ -4104,7 +4104,7 @@ bool8 sub_8010540(void) return retval; } -bool8 sub_80105EC(void) +bool32 sub_80105EC(void) { u8 flags = 0; int i; @@ -4129,7 +4129,7 @@ bool8 sub_80105EC(void) return FALSE; } -bool8 sub_801064C(u16 a0, const u8 *a1) +bool32 sub_801064C(u16 a0, const u8 *a1) { u8 r1 = sub_8011CE4(a1, a0); if (r1 == 0xFF) @@ -4154,14 +4154,14 @@ void sub_80106D4(void) rfu_NI_setSendData(1 << gUnknown_03005000.unk_c3e, 8, &gUnknown_03005000.unk_c85, 1); } -u8 sub_8010714(u16 a0, const u8 *a1) +u32 sub_8010714(u16 a0, const u8 *a1) { u8 r0 = sub_8011CE4(a1, a0); if (r0 == 0xff) return 2; if (gUnknown_03007880[r0]->unk_0 == 0) - return TRUE; - return FALSE; + return 1; + return 0; } void sub_8010750(void) diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index f37b4019f..e73030e75 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -11,47 +11,108 @@ #include "menu.h" #include "list_menu.h" #include "menu_helpers.h" +#include "script.h" +#include "sound.h" +#include "constants/songs.h" -struct UnkStruct_02 +struct UnkStruct_Shared { struct UnkLinkRfuStruct_02022B14 field_0; - u8 field_D; + u8 field_xD; u8 field_E; u8 field_F; u8 playerName[PLAYER_NAME_LENGTH]; +}; + +struct UnkStruct_x1C +{ + struct UnkStruct_Shared unk0; + u8 unk18; +}; + +struct UnkStruct_x20 +{ + struct UnkStruct_Shared unk; u16 field_18; u8 field_1A_0:2; u8 field_1A_1:1; u8 field_1B; + u8 field_1D; + u8 field_1E; + u8 field_1F; }; -struct UnkStruct_01 +struct UnkStruct_Main0 { - struct UnkStruct_02 *field_0; - void *field_4; - void *field_8; - u8 field_C; - u8 field_D; + struct UnkStruct_x20 arr[5]; +}; + +struct UnkStruct_Main4 +{ + struct UnkStruct_x1C arr[5]; +}; + +struct UnkStruct_Main8 +{ + struct UnkStruct_x20 arr[5]; +}; + +struct UnkStruct_Leader +{ + struct UnkStruct_Main0 *field_0; + struct UnkStruct_Main4 *field_4; + struct UnkStruct_Main8 *field_8; + u8 state; + u8 textState; u8 field_E; u8 field_F; u8 field_10; u8 field_11; - u8 field_12; + u8 listTaskId; u8 field_13; u8 field_14; u8 field_15; u8 field_16; u8 field_17; + u8 field_18; + u8 field_19; + u16 field_1A; }; -extern struct UnkStruct_01 *gUnknown_02022C30; +struct UnkStruct_Group +{ + struct UnkStruct_Main0 *field_0; + struct UnkStruct_Main4 *field_4; + u8 state; + u8 textState; + u8 field_A; + u8 field_B; + u8 field_C; + u8 field_D; + u8 listTaskId; + u8 field_F; + u8 field_10; + u8 field_11; + u8 field_12; + u8 field_13; + u8 field_14; + u8 field_15; +}; + +union UnkUnion_Main +{ + struct UnkStruct_Leader *leader; + struct UnkStruct_Group *group; +}; + +extern union UnkUnion_Main gUnknown_02022C30; extern u8 gUnknown_02022C2C; extern u8 gUnknown_02022C2D; // IWRAM vars -IWRAM_DATA struct UnkStruct_01 *gUnknown_03000DA0; -IWRAM_DATA u32 gUnknown_03000DA4; +IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; +IWRAM_DATA struct UnkStruct_Group *gUnknown_03000DA4; IWRAM_DATA void *gUnknown_03000DA8; IWRAM_DATA void *gUnknown_03000DAC; IWRAM_DATA bool32 gUnknown_03000DB0; @@ -60,24 +121,71 @@ IWRAM_DATA bool32 gUnknown_03000DB0; void sub_80173E0(u8 windowId, u8 arg1, const u8 *str, u8 arg3, u8 arg4, u8 arg5); u16 ReadAsU16(const u8 *ptr); void sub_8012780(u8 taskId); -void sub_80175EC(void *arg0, u8 count); -void sub_8017580(void *arg0, u8 count); -u8 sub_8016FC0(void *arg0, u32 arg1); -bool8 sub_8017064(u8 *arg0, const u8 *str); -void sub_801320C(struct UnkStruct_01 *arg0, u32 arg1, u32 arg2); +void sub_80134E8(u8 taskId); +void sub_80175EC(struct UnkStruct_Main4 *arg0, u8 count); +void sub_8017580(struct UnkStruct_Main0 *arg0, u8 count); +u8 sub_8016FC0(struct UnkStruct_Main4 *arg0, u32 arg1); +bool8 PrintOnTextbox(u8 *textState, const u8 *str); +bool8 sub_801320C(struct UnkStruct_Leader *data, u32 arg1, u32 arg2); +u8 sub_8013398(struct UnkStruct_Main0 *arg0); +s8 sub_80170B8(u8 *arg0, bool32 arg1); +void sub_8018404(u8 *dest, struct UnkStruct_x20 *arg1); +void sub_8012F64(struct UnkStruct_Leader *data); +void sub_80149C4(void); +u8 sub_80132D4(struct UnkStruct_Main0 *arg0); +void sub_80178A0(u8 arg0, u8 arg1, u8 arg2, struct UnkStruct_x20 *arg3, u8 arg4, u8 id); +u32 sub_80176E4(struct UnkStruct_x20 *arg0, struct UnkStruct_x1C *arg1); +void sub_8017734(struct UnkStruct_x20 *arg0, struct UnkStruct_Shared *arg1, u8 arg2); +u8 sub_8013E44(void); +u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id); +void sub_8013BD8(struct UnkStruct_Group *arg0, s32 id); +void sub_80173D4(void); // const rom data extern const u8 *const gUnknown_082EDB60[][5]; + extern const u8 gText_UnkCtrlCodeF907[]; extern const u8 gUnknown_082EDBC4[]; extern const u8 gText_AwaitingCommunication[]; +extern const u8 gText_AwaitingLink[]; +extern const u8 gUnknown_082EDC5C[]; +extern const u8 gUnknown_082EDC9C[]; +extern const u8 gUnknown_082EDC78[]; +extern const u8 gUnknown_082EDD58[]; +extern const u8 gUnknown_082EDBE8[]; +extern const u8 gUnknown_082EDC0C[]; +extern const u8 gUnknown_082EDC34[]; +extern const u8 gUnknown_082EE560[]; +extern const u8 gUnknown_082EE57C[]; +extern const u8 gUnknown_082EFC54[]; +extern const u8 gUnknown_082EFC3C[]; +extern const u8 gUnknown_082EDE0C[]; +extern const u8 gUnknown_082EDDF4[]; +extern const u8 gUnknown_082EF7DC[]; +extern const u8 gUnknown_082EDE48[]; +extern const u8 gUnknown_082EDE64[]; + extern const u32 gUnknown_082F00C4[]; + +extern const u8 gUnknown_082F0530[]; + extern const struct WindowTemplate gUnknown_082F00BC; extern const struct WindowTemplate gUnknown_082F0124; extern const struct WindowTemplate gUnknown_082F012C; extern const struct WindowTemplate gUnknown_082F011C; +extern const struct WindowTemplate gUnknown_082F0174; +extern const struct WindowTemplate gUnknown_082F017C; + extern const struct ListMenuTemplate gUnknown_082F015C; +extern const struct ListMenuTemplate gUnknown_082F0204; + extern const u8 *const gUnknown_082F0048[]; +extern const u8 *const gUnknown_082EDDC4[]; +extern const u8 *const gUnknown_082EFB70[]; +extern const u8 *const gUnknown_082EDD50[]; +extern const u8 *const gUnknown_082EDE9C[]; + +extern const struct UnkStruct_Shared gUnknown_082F045C[]; // code void nullsub_89(void) @@ -151,25 +259,26 @@ bool32 sub_80126CC(u32 caseId) void BerryBlenderLinkBecomeLeader(void) { u8 taskId; - struct UnkStruct_01 *dataPtr; + struct UnkStruct_Leader *dataPtr; taskId = CreateTask(sub_8012780, 0); - gUnknown_02022C30 = dataPtr = (void*)(gTasks[taskId].data); + gUnknown_02022C30.leader = dataPtr = (void*)(gTasks[taskId].data); gUnknown_03000DA0 = dataPtr; - dataPtr->field_C = 0; - dataPtr->field_D = 0; + dataPtr->state = 0; + dataPtr->textState = 0; gSpecialVar_Result = 0; } void sub_8012780(u8 taskId) { - struct UnkStruct_01 *data = gUnknown_02022C30; + u32 id, val; + struct UnkStruct_Leader *data = gUnknown_02022C30.leader; - switch (data->field_C) + switch (data->state) { case 0: - if (gSpecialVar_0x8004 == 20 || gSaveBlock2Ptr->frontierChosenLvl == 1) + if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontierChosenLvl == 1) gSpecialVar_0x8004++; gUnknown_02022C2C = gUnknown_082F00C4[gSpecialVar_0x8004]; gUnknown_02022C2D = gUnknown_082F00C4[gSpecialVar_0x8004] >> 8; @@ -177,7 +286,7 @@ void sub_8012780(u8 taskId) sub_800B488(); OpenLink(); sub_8011C10(gUnknown_02022C2D & 0xF); - data->field_C = 3; + data->state = 3; break; case 3: data->field_4 = AllocZeroed(0x70); @@ -185,11 +294,11 @@ void sub_8012780(u8 taskId) data->field_8 = AllocZeroed(0xA0); sub_80175EC(data->field_4, 4); sub_8017580(data->field_0, 5); - sub_800DF90(&data->field_0->field_0, data->field_0->playerName); - data->field_0->field_18 = 0; - data->field_0->field_1A_0 = 1; - data->field_0->field_1A_1 = 0; - data->field_0->field_1B = 0; + sub_800DF90(&data->field_0->arr[0].unk.field_0, data->field_0->arr[0].unk.playerName); + data->field_0->arr[0].field_18 = 0; + data->field_0->arr[0].field_1A_0 = 1; + data->field_0->arr[0].field_1A_1 = 0; + data->field_0->arr[0].field_1B = 0; data->field_17 = sub_8016FC0(data->field_4, 0xFF); data->field_10 = AddWindow(&gUnknown_082F00BC); switch (gUnknown_02022C2D & 0xF) @@ -213,7 +322,7 @@ void sub_8012780(u8 taskId) NewMenuHelpers_DrawStdWindowFrame(data->field_F, FALSE); gMultiuseListMenuTemplate = gUnknown_082F015C; gMultiuseListMenuTemplate.windowId = data->field_F; - data->field_12 = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); + data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); NewMenuHelpers_DrawStdWindowFrame(data->field_11, FALSE); PutWindowTilemap(data->field_11); @@ -221,7 +330,7 @@ void sub_8012780(u8 taskId) CopyBgTilemapBufferToVram(0); data->field_13 = 1; - data->field_C = 4; + data->state = 4; break; case 4: StringCopy(gStringVar1, gUnknown_082F0048[gUnknown_02022C2C]); @@ -238,18 +347,770 @@ void sub_8012780(u8 taskId) } sub_80124EC(data->field_11, gUnknown_02022C2D, data->field_13); - data->field_C = 5; + data->state = 5; break; case 5: - if (sub_8017064(&data->field_D, gStringVar4)) - data->field_C = 6; + if (PrintOnTextbox(&data->textState, gStringVar4)) + data->state = 6; break; case 6: sub_801320C(data, 7, 10); if (gMain.newKeys & B_BUTTON) { - if (data->field_13) + if (data->field_13 == 1) + data->state = 23; + else if ((gUnknown_02022C2D & 0xF0) != 0) + data->state = 30; + else + data->state = 19; + } + if ((gUnknown_02022C2D >> 4) != 0 + && data->field_13 > (gUnknown_02022C2D >> 4) - 1 + && (gUnknown_02022C2D & 0xF) != 0 + && sub_8012240() + && gMain.newKeys & START_BUTTON) + { + data->state = 15; + sub_800EF38(); + } + if (data->state == 6 && sub_80105EC()) + { + data->state = 9; + } + break; + case 9: + if (!sub_80105EC()) + { + data->state = 6; + data->field_13 = sub_8013398(data->field_0); + } + break; + case 10: + id = ((gUnknown_02022C2C & 0xF) == 2) ? 1 : 0; + if (PrintOnTextbox(&data->textState, gUnknown_082EDDC4[id])) + { + data->field_13 = sub_8013398(data->field_0); + sub_81AE70C(data->listTaskId); + data->state = 4; + } + break; + case 29: + id = ((gUnknown_02022C2D & 0xF) == 2) ? 0 : 1; + if (PrintOnTextbox(&data->textState, gUnknown_082EDDC4[id])) + { + data->state = 21; + } + break; + case 7: + if (PrintOnTextbox(&data->textState, gStringVar4)) + { + data->state = 11; + } + break; + case 11: + switch (sub_80170B8(&data->textState, sub_801064C(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName))) + { + case 0: + sub_800E0E8(); + CreateWirelessStatusIndicatorSprite(0, 0); + data->field_19 = 5; + sub_8010688(5, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + data->state = 12; + break; + case 1: + case -1: + data->field_19 = 6; + sub_8010688(6, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + data->state = 12; + break; + case -3: + data->state = 9; + break; + } + break; + case 12: + val = sub_8010714(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + if (val == 1) + { + if (data->field_19 == 5) + { + data->field_0->arr[data->field_13].field_1B = 0; + sub_81AE70C(data->listTaskId); + data->field_13++; + if (data->field_13 == (gUnknown_02022C2D & 0xF)) + { + if ((gUnknown_02022C2D & 0xF0) != 0 || data->field_13 == 4) + { + data->state = 15; + } + else + { + sub_8018404(gStringVar1, &data->field_0->arr[data->field_13 - 1]); + StringExpandPlaceholders(gStringVar4, gUnknown_082EDC9C); + data->state = 13; + } + + sub_800EF38(); + sub_80124EC(data->field_11, gUnknown_02022C2D, data->field_13); + } + else + { + data->state = 4; + } + } + else + { + sub_8011DC0(data->field_0->arr[data->field_13].unk.playerName, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId)); + data->field_0->arr[data->field_13].field_1A_0 = 0; + sub_8013398(data->field_0); + sub_81AE70C(data->listTaskId); + data->state = 4; + } + + data->field_19 = 0; } + else if (val == 2) + { + sub_8011A64(0, 0); + data->state = 4; + } + break; + case 13: + if (PrintOnTextbox(&data->textState, gStringVar4)) + data->state = 14; + break; + case 14: + if (++data->field_E > 120) + data->state = 17; + break; + case 15: + if (PrintOnTextbox(&data->textState, gUnknown_082EDC5C)) + data->state = 16; + break; + case 16: + switch (sub_80170B8(&data->textState, FALSE)) + { + case 0: + data->state = 17; + break; + case 1: + case -1: + if ((gUnknown_02022C2D & 0xF0) != 0) + data->state = 30; + else + data->state = 19; + break; + } + break; + case 19: + if (PrintOnTextbox(&data->textState, gUnknown_082EDC78)) + data->state = 20; + break; + case 20: + switch (sub_80170B8(&data->textState, FALSE)) + { + case 0: + data->state = 23; + break; + case 1: + case -1: + if ((gUnknown_02022C2D & 0xF0) != 0) + data->state = 15; + else if (data->field_13 == (gUnknown_02022C2D & 0xF)) + data->state = 15; + else + data->state = 4; + break; + } + break; + case 17: + if (!sub_801320C(data, 7, 29)) + data->state = 18; + break; + case 18: + if (sub_800EF1C()) + { + if (sub_800EF58(FALSE)) + { + data->state = 26; + } + else + { + if (++data->field_1A > 300) + { + data->state = 29; + data->textState = 0; + } + } + } + else + { + data->state = 29; + data->textState = 0; + } + break; + case 30: + if (PrintOnTextbox(&data->textState, gUnknown_082EDD58)) + data->state = 23; + break; + case 21: + case 23: + sub_800E084(); + sub_800EDD4(); + sub_8012F64(data); + data->state++; + break; + case 24: + EnableBothScriptContexts(); + DestroyTask(taskId); + gSpecialVar_Result = 5; + break; + case 22: + EnableBothScriptContexts(); + DestroyTask(taskId); + gSpecialVar_Result = 8; + break; + case 26: + if (sub_8011A80()) + { + data->state = 29; + } + else + { + if (gReceivedRemoteLinkPlayers != 0) + { + if (sub_80126CC(gUnknown_02022C2C)) + sub_801103C(); + sub_8011068(1); + sub_80149C4(); + sub_8012F64(data); + DestroyTask(taskId); + } + } + break; + } +} + +void sub_8012F64(struct UnkStruct_Leader *data) +{ + ClearWindowTilemap(data->field_11); + sub_819746C(data->field_11, FALSE); + DestroyListMenuTask(data->listTaskId, 0, 0); + ClearWindowTilemap(data->field_10); + sub_819746C(data->field_F, FALSE); + CopyBgTilemapBufferToVram(0); + RemoveWindow(data->field_11); + RemoveWindow(data->field_F); + RemoveWindow(data->field_10); + DestroyTask(data->field_17); + + Free(data->field_8); + Free(data->field_0); + Free(data->field_4); +} + +void sub_8012FC4(u8 *dst, u8 caseId) +{ + switch (caseId) + { + case 1: + case 2: + case 4: + case 14: + case 28: + StringExpandPlaceholders(dst, gUnknown_082EDBE8); + break; + case 21: + case 22: + StringExpandPlaceholders(dst, gUnknown_082EDC0C); + break; + case 3: + case 9: + case 10: + case 11: + case 15: + case 16: + case 23: + case 24: + case 25: + case 26: + case 27: + StringExpandPlaceholders(dst, gUnknown_082EDC34); + break; + } +} + +void sub_8013078(u8 *dst, u8 caseId) +{ + switch (caseId) + { + case 65: + case 68: + StringExpandPlaceholders(dst, gUnknown_082EE560); + break; + case 69: + case 72: + StringExpandPlaceholders(dst, gUnknown_082EE57C); + break; + } +} + +void sub_80130B4(u8 *dst, u8 caseId) +{ + switch (caseId) + { + case 1: + case 2: + case 4: + case 14: + case 21: + case 22: + case 28: + StringExpandPlaceholders(dst, gUnknown_082EFC3C); + break; + case 3: + case 9: + case 10: + case 11: + case 15: + case 16: + case 23: + case 24: + case 25: + case 26: + case 27: + StringExpandPlaceholders(dst, gUnknown_082EFC54); + break; + } +} + +void sub_8013160(u8 *dst, u8 caseId) +{ + switch (caseId) + { + case 1: + case 2: + case 4: + case 14: + case 21: + case 22: + case 28: + StringExpandPlaceholders(dst, gUnknown_082EDDF4); + break; + case 3: + case 9: + case 10: + case 11: + case 15: + case 16: + case 23: + case 24: + case 25: + case 26: + case 27: + StringExpandPlaceholders(dst, gUnknown_082EDE0C); + break; + } +} + +bool8 sub_801320C(struct UnkStruct_Leader *data, u32 arg1, u32 arg2) +{ + switch (sub_80132D4(data->field_0)) + { + case 1: + PlaySE(SE_PC_LOGIN); + sub_81AE70C(data->listTaskId); + sub_8018404(gStringVar2, &data->field_0->arr[data->field_13]); + sub_8012FC4(gStringVar4, gUnknown_02022C2C); + data->state = arg1; + break; + case 2: + sub_8011A64(0, 0); + sub_81AE70C(data->listTaskId); + data->state = arg2; + return TRUE; + } + + return FALSE; +} + +void sub_8013278(u8 arg0, u32 id, u8 arg2) +{ + struct UnkStruct_Leader *data = gUnknown_02022C30.leader; + u8 var = 0; + + switch (data->field_0->arr[id].field_1A_0) + { + case 1: + if (data->field_0->arr[id].field_1B != 0) + var = 2; + break; + case 2: + var = 1; + break; + } + + sub_80178A0(arg0, 0, arg2, &data->field_0->arr[id], var, id); +} + +u8 sub_80132D4(struct UnkStruct_Main0 *arg0) +{ + struct UnkStruct_Leader *data = gUnknown_02022C30.leader; + u8 ret = 0; + u8 i; + s32 id; + + for (i = 1; i < 5; i++) + { + u16 var = data->field_0->arr[i].field_1A_0; + if (var == 1) + { + id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); + if (id != 0xFF) + { + data->field_0->arr[i].unk = data->field_4->arr[id].unk0; + data->field_0->arr[i].field_18 = var; + } + else + { + data->field_0->arr[i].field_1A_0 = 2; + ret = 2; + } + } + } + + for (id = 0; id < 4; id++) + sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 5); + + if (ret != 2) + { + for (id = 0; id < 5; id++) + { + if (data->field_0->arr[id].field_1B != 0) + ret = 1; + } + } + + return ret; +} + +u8 sub_8013398(struct UnkStruct_Main0 *arg0) +{ + struct UnkStruct_Leader *data = gUnknown_02022C30.leader; + u8 copiedCount; + s32 i; + u8 ret; + + for (i = 0; i < 5; i++) + data->field_8->arr[i] = data->field_0->arr[i]; + + copiedCount = 0; + for (i = 0; i < 5; i++) + { + if (data->field_8->arr[i].field_1A_0 == 1) + { + data->field_0->arr[copiedCount] = data->field_8->arr[i]; + copiedCount++; + } + } + + ret = copiedCount; + for (; copiedCount < 5; copiedCount++) + { + data->field_0->arr[copiedCount].unk = gUnknown_082F045C[0]; + data->field_0->arr[copiedCount].field_18 = 0; + data->field_0->arr[copiedCount].field_1A_0 = 0; + data->field_0->arr[copiedCount].field_1A_1 = 0; + data->field_0->arr[copiedCount].field_1B = 0; + } + + for (i = 0; i < 5; i++) + { + if (data->field_0->arr[i].field_1A_0 != 1) + continue; + if (data->field_0->arr[i].field_1B != 0x40) + continue; + + ret = i; + break; + } + + return ret; +} + +void BerryBlenderLinkJoinGroup(void) +{ + u8 taskId; + struct UnkStruct_Group *dataPtr; + + taskId = CreateTask(sub_80134E8, 0); + gUnknown_02022C30.group = dataPtr = (void*)(gTasks[taskId].data); + gUnknown_03000DA4 = dataPtr; + + dataPtr->state = 0; + dataPtr->textState = 0; + gSpecialVar_Result = 0; +} + +void sub_80134E8(u8 taskId) +{ + s32 id; + struct UnkStruct_Group *data = gUnknown_02022C30.group; + + switch (data->state) + { + case 0: + if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontierChosenLvl == 1) + gSpecialVar_0x8004++; + gUnknown_02022C2C = gUnknown_082F0530[gSpecialVar_0x8004]; + sub_8010F84(gUnknown_02022C2C, 0, 0); + sub_800B488(); + OpenLink(); + sub_8011C5C(); + data->field_4 = AllocZeroed(0x70); + data->field_0 = AllocZeroed(0x200); + data->state = 1; + break; + case 1: + if (PrintOnTextbox(&data->textState, gUnknown_082EFB70[gSpecialVar_0x8004])) + data->state = 2; + break; + case 2: + sub_80175EC(data->field_4, 4); + sub_8017580(data->field_0, 16); + data->field_11 = sub_8016FC0(data->field_4, gSpecialVar_0x8004); + data->field_C = AddWindow(&gUnknown_082F00BC); + data->field_B = AddWindow(&gUnknown_082F0174); + data->field_D = AddWindow(&gUnknown_082F017C); + + FillWindowPixelBuffer(data->field_C, 0x22); + sub_80173E0(data->field_C, 0, gUnknown_082EF7DC, 8, 1, 4); + PutWindowTilemap(data->field_C); + CopyWindowToVram(data->field_C, 2); + + NewMenuHelpers_DrawStdWindowFrame(data->field_B, FALSE); + gMultiuseListMenuTemplate = gUnknown_082F0204; + gMultiuseListMenuTemplate.windowId = data->field_B; + data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); + + NewMenuHelpers_DrawStdWindowFrame(data->field_D, FALSE); + PutWindowTilemap(data->field_D); + sub_80125BC(data->field_D); + CopyWindowToVram(data->field_D, 2); + + CopyBgTilemapBufferToVram(0); + data->field_F = 0; + data->state = 3; + break; + case 3: + id = sub_8013E44(); + switch (id) + { + case 1: + PlaySE(SE_PC_LOGIN); + sub_81AE70C(data->listTaskId); + break; + case 0: + id = ListMenuHandleInputGetItemId(data->listTaskId); + if (gMain.newKeys & A_BUTTON && id != -1) + { + // this unused variable is needed to match + u32 unusedVar; + unusedVar = data->field_0->arr[id].unk.field_0.unk_0a_0; + + if (data->field_0->arr[id].field_1A_0 == 1 && data->field_0->arr[id].unk.field_0.unk_0a_7 == 0) + { + u32 var = sub_8013B8C(data, id); + if (var == 0) + { + sub_8013BD8(data, id); + data->state = 5; + PlaySE(SE_PN_ON); + } + else + { + StringCopy(gStringVar4, gUnknown_082EDD50[var - 1]); + data->state = 18; + PlaySE(SE_PN_ON); + } + } + else + { + PlaySE(SE_WALL_HIT); + } + } + else if (gMain.newKeys & B_BUTTON) + { + data->state = 10; + } + break; + default: + sub_81AE70C(data->listTaskId); + break; + } + break; + case 5: + sub_80130B4(gStringVar4, gUnknown_02022C2C); + if (PrintOnTextbox(&data->textState, gStringVar4)) + { + sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]); + data->state = 6; + } + break; + case 6: + if (gReceivedRemoteLinkPlayers != 0) + { + gUnknown_02022C2C = data->field_0->arr[data->field_F].unk.field_0.unk_0a_0; + sub_8011A64(0, 0); + switch (gUnknown_02022C2C) + { + case 1 ... 5: + case 9 ... 11: + case 13 ... 16: + case 21 ... 28: + data->state = 20; + return; + } + } + + switch (sub_8011A74()) + { + case 1: + data->state = 12; + break; + case 2: + case 6: + case 9: + data->state = 14; + break; + case 5: + sub_8013160(gStringVar4, gUnknown_02022C2C); + if (PrintOnTextbox(&data->textState, gStringVar4)) + { + if (gUnknown_02022C2C == 28 || gUnknown_02022C2C == 14) + { + sub_8011A64(12, 0); + } + else + { + sub_8011A64(7, 0); + StringCopy(gStringVar1, gUnknown_082F0048[gUnknown_02022C2C]); + StringExpandPlaceholders(gStringVar4, gUnknown_082EDE48); + } + } + break; + case 7: + if (data->field_15 > 0xF0) + { + if (PrintOnTextbox(&data->textState, gStringVar4)) + { + sub_8011A64(12, 0); + data->field_15 = 0; + } + } + else + { + switch (gUnknown_02022C2C) + { + case 1: + case 2: + case 4: + case 14: + case 28: + break; + default: + data->field_15++; + break; + } + } + break; + } + + if (!sub_8011A74() && gMain.newKeys & B_BUTTON) + data->state = 7; + break; + case 7: + if (PrintOnTextbox(&data->textState, gUnknown_082EDE64)) + data->state = 8; + break; + case 8: + switch (sub_80170B8(&data->textState, sub_8011A74())) + { + case 0: + sub_80106D4(); + data->state = 9; + sub_81AE70C(data->listTaskId); + break; + case 1: + case -1: + data->state = 5; + sub_81AE70C(data->listTaskId); + break; + case -3: + data->state = 6; + sub_81AE70C(data->listTaskId); + break; + } + break; + case 9: + if (sub_8011A74()) + data->state = 6; + break; + case 10: + case 12: + case 14: + case 18: + case 20: + ClearWindowTilemap(data->field_D); + sub_819746C(data->field_D, FALSE); + DestroyListMenuTask(data->listTaskId, 0, 0); + ClearWindowTilemap(data->field_C); + sub_819746C(data->field_B, FALSE); + CopyBgTilemapBufferToVram(0); + RemoveWindow(data->field_D); + RemoveWindow(data->field_B); + RemoveWindow(data->field_C); + DestroyTask(data->field_11); + Free(data->field_0); + Free(data->field_4); + data->state++; + break; + case 13: + sub_800E084(); + if (PrintOnTextbox(&data->textState, gUnknown_082EDE9C[sub_8011A74()])) + { + gSpecialVar_Result = 6; + data->state = 23; + } + break; + case 11: + sub_800E084(); + gSpecialVar_Result = 5; + data->state = 23; + break; + case 15: + sub_800E084(); + if (PrintOnTextbox(&data->textState, gUnknown_082EDE9C[sub_8011A74()])) + { + gSpecialVar_Result = 8; + data->state = 23; + } + break; + case 19: + if (PrintOnTextbox(&data->textState, gStringVar4)) + { + gSpecialVar_Result = 8; + data->state = 23; + } + break; + case 23: + DestroyTask(taskId); + sub_80173D4(); + sub_800EDD4(); + break; + case 21: + sub_80149C4(); + DestroyTask(taskId); break; } } -- cgit v1.2.3 From e50f4b499928ac9010ecd96cff96de9f7bda2846 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 3 Jun 2018 22:39:10 +0200 Subject: still going --- asm/rom_8011DC0.s | 940 ----------------------------------------- include/cable_club.h | 1 + include/field_control_avatar.h | 1 + include/link.h | 2 +- include/link_rfu.h | 2 + include/trade.h | 4 +- include/trainer_card.h | 3 + src/rom_8011DC0.c | 385 ++++++++++++++++- src/walda_phrase.c | 1 - 9 files changed, 394 insertions(+), 945 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 97b27bab9..e811bb428 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -6,947 +6,7 @@ .text - thumb_func_start sub_8013B8C -sub_8013B8C: @ 8013B8C - push {lr} - lsls r1, 5 - ldr r0, [r0] - adds r3, r0, r1 - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - cmp r0, 0x4 - bne _08013BCE - ldrb r1, [r3, 0x1] - movs r0, 0x3C - ands r0, r1 - cmp r0, 0xC - beq _08013BCE - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r1, [r0, 0x9] - movs r2, 0x80 - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _08013BC4 - movs r0, 0x1 - b _08013BD4 - .pool -_08013BC4: - ldrb r1, [r3] - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _08013BD2 -_08013BCE: - movs r0, 0 - b _08013BD4 -_08013BD2: - movs r0, 0x2 -_08013BD4: - pop {r1} - bx r1 - thumb_func_end sub_8013B8C - - thumb_func_start sub_8013BD8 -sub_8013BD8: @ 8013BD8 - push {r4,lr} - adds r4, r0, 0 - strb r1, [r4, 0xF] - bl sub_800E0E8 - movs r0, 0 - movs r1, 0 - bl CreateWirelessStatusIndicatorSprite - ldrb r0, [r4, 0xE] - bl sub_81AE70C - ldr r0, =gStringVar1 - ldrb r2, [r4, 0xF] - lsls r2, 5 - ldr r1, [r4] - adds r1, r2 - bl sub_8018404 - ldr r1, =gUnknown_082F0530 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - adds r0, r1 - ldrb r0, [r0] - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - ldrb r1, [r4, 0xF] - lsls r1, 5 - ldr r0, [r4] - adds r0, r1 - adds r4, r0, 0 - adds r4, 0x10 - adds r0, 0x2 - bl ReadAsU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl sub_8011FC8 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8013BD8 - - thumb_func_start sub_8013C40 -sub_8013C40: @ 8013C40 - push {lr} - ldr r0, =sub_8013C7C - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r3, =gUnknown_02022C30 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r2, =gTasks + 0x8 - adds r1, r2 - str r1, [r3] - movs r2, 0 - strb r2, [r1, 0x8] - strb r2, [r1, 0x9] - ldr r2, =gUnknown_03000DA4 - str r1, [r2] - pop {r1} - bx r1 - .pool - thumb_func_end sub_8013C40 - - thumb_func_start sub_8013C7C -sub_8013C7C: @ 8013C7C - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, =gUnknown_02022C30 - ldr r4, [r0] - ldrb r0, [r4, 0x8] - cmp r0, 0xB - bhi _08013D80 - lsls r0, 2 - ldr r1, =_08013CA0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08013CA0: - .4byte _08013CD0 - .4byte _08013D80 - .4byte _08013D04 - .4byte _08013D28 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D80 - .4byte _08013D58 - .4byte _08013D76 -_08013CD0: - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010F84 - bl sub_800B488 - bl OpenLink - bl sub_8011C5C - movs r0, 0x1 - bl sub_80111B0 - movs r0, 0x70 - bl AllocZeroed - str r0, [r4, 0x4] - movs r0, 0x80 - lsls r0, 2 - bl AllocZeroed - str r0, [r4] - movs r0, 0x2 - strb r0, [r4, 0x8] - b _08013D80 -_08013D04: - ldr r0, [r4, 0x4] - movs r1, 0x4 - bl sub_80175EC - ldr r0, [r4] - movs r1, 0x10 - bl sub_8017580 - ldr r0, [r4, 0x4] - movs r1, 0xFF - bl sub_8016FC0 - movs r1, 0 - strb r0, [r4, 0x11] - strb r1, [r4, 0xF] - movs r0, 0x3 - strb r0, [r4, 0x8] - b _08013D80 -_08013D28: - bl sub_8013E44 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08013D3A - movs r0, 0x2 - bl PlaySE -_08013D3A: - ldr r0, =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - movs r2, 0x26 - ldrsh r0, [r1, r2] - cmp r0, 0xFF - bne _08013D80 - movs r0, 0xA - strb r0, [r4, 0x8] - b _08013D80 - .pool -_08013D58: - ldrb r0, [r4, 0x11] - bl DestroyTask - ldr r0, [r4] - bl Free - ldr r0, [r4, 0x4] - bl Free - bl sub_800EDD4 - ldrb r0, [r4, 0x8] - adds r0, 0x1 - strb r0, [r4, 0x8] - b _08013D80 -_08013D76: - bl sub_800EDD4 - adds r0, r5, 0 - bl DestroyTask -_08013D80: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8013C7C - - thumb_func_start sub_8013D88 -sub_8013D88: @ 8013D88 - push {lr} - adds r2, r0, 0 - cmp r1, 0xFF - bne _08013D94 -_08013D90: - movs r0, 0x1 - b _08013DB8 -_08013D94: - cmp r1, 0x16 - bhi _08013DB6 - ldr r0, =gUnknown_082F04D8 - lsls r1, 2 - adds r1, r0 - ldr r1, [r1] - b _08013DB0 - .pool -_08013DA8: - ldrb r0, [r1] - cmp r0, r2 - beq _08013D90 - adds r1, 0x1 -_08013DB0: - ldrb r0, [r1] - cmp r0, 0xFF - bne _08013DA8 -_08013DB6: - movs r0, 0 -_08013DB8: - pop {r1} - bx r1 - thumb_func_end sub_8013D88 - - thumb_func_start sub_8013DBC -sub_8013DBC: @ 8013DBC - push {lr} - ldr r0, [r0] - lsls r1, 5 - adds r1, r0, r1 - ldrb r2, [r1, 0x1A] - lsls r0, r2, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _08013DEE - ldrb r0, [r1, 0xA] - lsrs r0, 7 - cmp r0, 0 - beq _08013DDA - movs r0, 0x3 - b _08013DF0 -_08013DDA: - lsls r0, r2, 29 - cmp r0, 0 - bge _08013DE4 - movs r0, 0x1 - b _08013DF0 -_08013DE4: - ldrb r0, [r1, 0x1B] - cmp r0, 0 - beq _08013DEE - movs r0, 0x2 - b _08013DF0 -_08013DEE: - movs r0, 0 -_08013DF0: - pop {r1} - bx r1 - thumb_func_end sub_8013DBC - - thumb_func_start sub_8013DF4 -sub_8013DF4: @ 8013DF4 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x8 - adds r5, r0, 0 - adds r4, r1, 0 - adds r6, r2, 0 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - ldr r0, =gUnknown_02022C30 - ldr r0, [r0] - mov r8, r0 - bl sub_8013DBC - lsls r0, 24 - lsrs r0, 24 - lsls r1, r4, 5 - mov r2, r8 - ldr r3, [r2] - adds r3, r1 - str r0, [sp] - lsls r4, 24 - lsrs r4, 24 - str r4, [sp, 0x4] - adds r0, r5, 0 - movs r1, 0x8 - adds r2, r6, 0 - bl sub_80177B8 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8013DF4 - - thumb_func_start sub_8013E44 -sub_8013E44: @ 8013E44 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - ldr r0, =gUnknown_02022C30 - ldr r6, [r0] - movs r7, 0 - movs r3, 0 -_08013E54: - ldr r0, [r6] - lsls r5, r3, 5 - adds r2, r0, r5 - ldrb r0, [r2, 0x1A] - lsls r0, 30 - mov r8, r5 - cmp r0, 0 - beq _08013F20 - ldr r1, [r6, 0x4] - adds r0, r2, 0 - str r3, [sp] - bl sub_80176E4 - adds r4, r0, 0 - ldr r3, [sp] - cmp r4, 0xFF - beq _08013EEE - ldr r0, [r6] - adds r2, r0, r5 - ldrb r1, [r2, 0x1A] - lsls r0, r1, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _08013ECC - lsls r0, r4, 3 - subs r0, r4 - lsls r4, r0, 2 - ldr r1, [r6, 0x4] - adds r1, r4 - adds r0, r2, 0 - bl sub_8017678 - ldr r3, [sp] - cmp r0, 0 - beq _08013EB0 - ldr r1, [r6] - ldr r0, [r6, 0x4] - adds r1, r5 - adds r0, r4 - ldm r0!, {r2,r4,r7} - stm r1!, {r2,r4,r7} - ldm r0!, {r2,r4,r7} - stm r1!, {r2,r4,r7} - b _08013EDA - .pool -_08013EB0: - ldr r0, [r6] - adds r1, r0, r5 - ldrb r0, [r1, 0x1B] - cmp r0, 0 - beq _08013EE4 - subs r0, 0x1 - strb r0, [r1, 0x1B] - ldr r0, [r6] - adds r0, r5 - ldrb r0, [r0, 0x1B] - cmp r0, 0 - bne _08013EE4 - movs r7, 0x2 - b _08013EE4 -_08013ECC: - movs r4, 0x4 - negs r4, r4 - adds r0, r4, 0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x1A] -_08013EDA: - ldr r0, [r6] - adds r0, r5 - movs r1, 0x40 - strb r1, [r0, 0x1B] - movs r7, 0x1 -_08013EE4: - ldr r0, [r6] - add r0, r8 - movs r1, 0 - strh r1, [r0, 0x18] - b _08013F20 -_08013EEE: - ldr r0, [r6] - adds r1, r0, r5 - ldrb r0, [r1, 0x1A] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x2 - beq _08013F20 - ldrh r0, [r1, 0x18] - adds r0, 0x1 - strh r0, [r1, 0x18] - ldr r0, [r6] - adds r2, r0, r5 - ldrh r1, [r2, 0x18] - ldr r0, =0x0000012b - cmp r1, r0 - bls _08013F20 - ldrb r0, [r2, 0x1A] - movs r7, 0x4 - negs r7, r7 - adds r1, r7, 0 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2, 0x1A] - movs r7, 0x2 -_08013F20: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0xF - bls _08013E54 - movs r5, 0 - movs r4, 0x3 -_08013F2E: - ldr r0, [r6] - ldr r1, [r6, 0x4] - adds r1, r5 - movs r2, 0x10 - bl sub_8017734 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08013F44 - movs r7, 0x1 -_08013F44: - adds r5, 0x1C - subs r4, 0x1 - cmp r4, 0 - bge _08013F2E - adds r0, r7, 0 - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8013E44 - - thumb_func_start sub_8013F60 -sub_8013F60: @ 8013F60 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl sub_80773AC - adds r0, r4, 0 - bl DestroyTask - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8013F60 - - thumb_func_start sub_8013F78 -sub_8013F78: @ 8013F78 - push {lr} - ldr r0, =sub_8013F60 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8013F78 - - thumb_func_start sub_8013F90 -sub_8013F90: @ 8013F90 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, =gUnknown_02022C40 - mov r8, r0 - bl GetMultiplayerId - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - mov r0, r8 - bl sub_8018120 - adds r7, r0, 0 - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r5, r0, r1 - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _08013FFC - cmp r0, 0x1 - bgt _08013FD4 - cmp r0, 0 - beq _08013FDE - b _080140BC - .pool -_08013FD4: - cmp r0, 0x2 - beq _08014038 - cmp r0, 0x3 - beq _08014070 - b _080140BC -_08013FDE: - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0x64 - adds r1, r7, 0 - muls r1, r0 - ldr r0, =gPlayerParty - adds r1, r0 - movs r0, 0 - movs r2, 0x64 - bl SendBlock - b _080140BC - .pool -_08013FFC: - bl GetBlockReceivedStatus - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bne _080140BC - bl GetMultiplayerId - adds r1, r0, 0 - ldr r0, =gEnemyParty - movs r2, 0x1 - eors r1, r2 - lsls r1, 24 - lsrs r1, 16 - ldr r2, =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x64 - bl memcpy - movs r0, 0x32 - bl IncrementGameStat - bl ResetBlockReceivedFlags - b _0801405A - .pool -_08014038: - ldr r4, =gBlockSendBuffer - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =0x00002be0 - adds r1, r0 - adds r0, r4, 0 - movs r2, 0xDC - bl memcpy - movs r0, 0 - adds r1, r4, 0 - movs r2, 0xDC - bl SendBlock - lsls r0, 24 - cmp r0, 0 - beq _080140BC -_0801405A: - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - b _080140BC - .pool -_08014070: - bl GetBlockReceivedStatus - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bne _080140BC - ldr r4, =gUnknown_020321C0 - bl GetMultiplayerId - adds r1, r0, 0 - movs r0, 0x1 - eors r1, r0 - lsls r1, 24 - lsrs r1, 16 - ldr r0, =gBlockRecvBuffer - adds r1, r0 - adds r0, r4, 0 - movs r2, 0xD8 - bl memcpy - bl ResetBlockReceivedFlags - ldr r1, =gUnknown_02032298 - strb r7, [r1] - movs r0, 0x6 - strb r0, [r1, 0x1] - ldr r1, =gMain - ldr r0, =CB2_ReturnToField - str r0, [r1, 0x8] - ldr r0, =sub_807AE50 - bl SetMainCallback2 - mov r0, r8 - bl sub_801807C - adds r0, r6, 0 - bl DestroyTask -_080140BC: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8013F90 - - thumb_func_start sub_80140E0 -sub_80140E0: @ 80140E0 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08014104 - cmp r0, 0x1 - beq _0801411C - b _0801419E - .pool -_08014104: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _08014114 - movs r0, 0x2 - bl sub_800A4D8 -_08014114: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _0801419E -_0801411C: - bl GetBlockReceivedStatus - adds r4, r0, 0 - bl sub_800A9D8 - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - bne _0801419E - movs r4, 0 - ldr r5, =gLinkPlayers - b _08014152 - .pool -_08014138: - lsls r1, r4, 8 - ldr r0, =gBlockRecvBuffer - adds r3, r1, r0 - movs r0, 0x64 - muls r0, r4 - ldr r1, =gTrainerCards - adds r0, r1 - ldrb r2, [r5] - adds r1, r3, 0 - bl sub_80C3120 - adds r5, 0x1C - adds r4, 0x1 -_08014152: - bl GetLinkPlayerCount - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - blt _08014138 - bl GetLinkPlayerCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _08014190 - bl GetMultiplayerId - movs r1, 0x1 - eors r0, r1 - lsls r0, 24 - lsrs r0, 16 - ldr r1, =gBlockRecvBuffer - adds r3, r0, r1 - adds r0, r3, 0 - adds r0, 0x60 - ldrh r0, [r0] - bl sub_801B94C - b _08014194 - .pool -_08014190: - bl sub_801B940 -_08014194: - bl ResetBlockReceivedFlags - adds r0, r6, 0 - bl DestroyTask -_0801419E: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80140E0 - - thumb_func_start sub_80141A4 -sub_80141A4: @ 80141A4 - push {r4,lr} - ldr r0, =gMain - movs r1, 0x87 - lsls r1, 3 - adds r4, r0, r1 - ldrb r0, [r4] - cmp r0, 0 - beq _080141C0 - cmp r0, 0x1 - beq _080141D4 - b _080141F2 - .pool -_080141C0: - ldr r0, =sub_80140E0 - movs r1, 0x5 - bl CreateTask - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - b _080141F2 - .pool -_080141D4: - ldr r0, =sub_80140E0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - bne _080141F2 - bl GetMultiplayerId - movs r1, 0x1 - eors r0, r1 - lsls r0, 24 - lsrs r0, 24 - ldr r1, =CB2_ReturnToField - bl sub_80C4E74 -_080141F2: - bl RunTasks - bl RunTextPrinters - bl AnimateSprites - bl BuildOamBuffer - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80141A4 - - thumb_func_start sub_8014210 -sub_8014210: @ 8014210 - push {r4-r6,lr} - adds r6, r0, 0 - lsls r6, 16 - lsrs r6, 16 - bl HealPlayerParty - bl SavePlayerParty - bl LoadPlayerBag - ldr r5, =gLinkPlayers - ldr r0, =0x00002211 - str r0, [r5, 0x14] - bl GetMultiplayerId - adds r4, r0, 0 - bl GetMultiplayerId - lsls r4, 24 - lsrs r4, 24 - lsls r1, r4, 3 - subs r1, r4 - lsls r1, 2 - adds r1, r5 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r1, 0x18] - bl GetMultiplayerId - adds r4, r0, 0 - bl GetMultiplayerId - movs r2, 0x1 - eors r4, r2 - lsls r4, 24 - lsrs r4, 24 - lsls r1, r4, 3 - subs r1, r4 - lsls r1, 2 - adds r1, r5 - eors r0, r2 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r1, 0x18] - ldr r1, =gMain - ldr r0, =sub_80B360C - str r0, [r1, 0x8] - ldr r0, =gBattleTypeFlags - str r6, [r0] - bl PlayBattleBGM - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8014210 - - thumb_func_start sub_8014290 -sub_8014290: @ 8014290 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x8 - adds r3, r0, 0 - adds r4, r1, 0 - adds r5, r2, 0 - lsls r3, 16 - lsrs r3, 16 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 16 - lsrs r5, 16 - ldr r0, =0x00004087 - adds r1, r3, 0 - bl VarSet - ldr r6, =gSaveBlock1Ptr - ldr r1, [r6] - movs r0, 0x4 - ldrsb r0, [r1, r0] - ldrb r1, [r1, 0x5] - lsls r1, 24 - asrs r1, 24 - movs r2, 0x1 - negs r2, r2 - mov r8, r2 - lsls r4, 24 - asrs r4, 24 - lsls r5, 24 - asrs r5, 24 - str r5, [sp] - adds r3, r4, 0 - bl Overworld_SetWarpDestination - ldr r0, [r6] - movs r1, 0x4 - ldrsb r1, [r0, r1] - movs r2, 0x5 - ldrsb r2, [r0, r2] - str r4, [sp] - str r5, [sp, 0x4] - movs r0, 0 - mov r3, r8 - bl saved_warp2_set_2 - bl warp_in - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8014290 - thumb_func_start sub_8014304 -sub_8014304: @ 8014304 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x4 - adds r4, r0, 0 - adds r5, r1, 0 - mov r8, r2 - adds r6, r3, 0 - ldr r1, [sp, 0x18] - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r1, 16 - lsrs r1, 16 - ldr r0, =gSpecialVar_0x8004 - strh r1, [r0] - ldr r0, =0x00004087 - bl VarSet - bl GetLinkPlayerCount - ldr r1, =gFieldLinkPlayerCount - strb r0, [r1] - bl GetMultiplayerId - ldr r1, =gUnknown_03005DB4 - strb r0, [r1] - bl sub_809D2BC - lsls r4, 24 - asrs r4, 24 - lsls r5, 24 - asrs r5, 24 - movs r2, 0x1 - negs r2, r2 - mov r0, r8 - lsls r0, 24 - asrs r0, 24 - mov r8, r0 - lsls r6, 24 - asrs r6, 24 - str r6, [sp] - adds r0, r4, 0 - adds r1, r5, 0 - mov r3, r8 - bl Overworld_SetWarpDestination - bl warp_in - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8014304 thumb_func_start sub_8014384 sub_8014384: @ 8014384 diff --git a/include/cable_club.h b/include/cable_club.h index 44831235c..7b47c9f73 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -9,5 +9,6 @@ void sub_80B37D4(TaskFunc taskFunc); u8 sub_80B3050(void); +void sub_80B360C(void); #endif //GUARD_CABLE_CLUB_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index b915d1419..16666d457 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -37,5 +37,6 @@ bool8 sub_8068894(void); bool8 sub_8068A64(struct MapPosition *, u16); u8 sub_8068F18(void); bool8 dive_warp(struct MapPosition *position, u16 b); +void sub_809D2BC(void); #endif // GUARD_FIELDCONTROLAVATAR_H diff --git a/include/link.h b/include/link.h index 5b3cd26ca..5ef1dca4c 100644 --- a/include/link.h +++ b/include/link.h @@ -122,7 +122,7 @@ struct LinkPlayer /* 0x08 */ u8 name[11]; /* 0x13 */ u8 gender; /* 0x14 */ u32 linkType; - /* 0x18 */ u16 lp_field_18; // battle bank in battles + /* 0x18 */ u16 lp_field_18; // battler id in battles /* 0x1A */ u16 language; }; diff --git a/include/link_rfu.h b/include/link_rfu.h index b517fba17..95bae9d06 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -248,5 +248,7 @@ void sub_800E084(void); void sub_801103C(void); void sub_8011C5C(void); void sub_80106D4(void); +void sub_8011090(u8 a0, u32 a1, u32 a2); +void sub_8011FC8(u8 *a0, u16 a1); #endif //GUARD_LINK_RFU_H diff --git a/include/trade.h b/include/trade.h index 15438ff3f..af4da0015 100644 --- a/include/trade.h +++ b/include/trade.h @@ -7,6 +7,8 @@ // Exported ROM declarations -int sub_807A728(void); +s32 sub_807A728(void); +void sub_80773AC(void); +void sub_807AE50(void); #endif //GUARD_TRADE_H diff --git a/include/trainer_card.h b/include/trainer_card.h index 5cb93dba0..6afcba5b1 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -32,4 +32,7 @@ struct TrainerCard extern struct TrainerCard gTrainerCards[4]; +void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion); +void sub_80C4E74(u8 arg0, void (*callback)(void)); + #endif // GUARD_TRAINER_CARD_H diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index e73030e75..514fd49a7 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -14,6 +14,16 @@ #include "script.h" #include "sound.h" #include "constants/songs.h" +#include "constants/game_stat.h" +#include "trade.h" +#include "trainer_card.h" +#include "overworld.h" +#include "battle.h" +#include "load_save.h" +#include "cable_club.h" +#include "field_control_avatar.h" + +extern void HealPlayerParty(void); struct UnkStruct_Shared { @@ -105,11 +115,30 @@ union UnkUnion_Main struct UnkStruct_Group *group; }; +struct TradeUnkStruct +{ + u16 field_0; + u16 field_2; + u32 field_4; + u32 field_8; + u16 field_A; + u16 field_C; + u16 field_E; + u16 field_10; + u16 field_12; + u32 field_14; +}; + +extern struct TradeUnkStruct gUnknown_02022C40; + extern union UnkUnion_Main gUnknown_02022C30; extern u8 gUnknown_02022C2C; extern u8 gUnknown_02022C2D; +extern u8 gFieldLinkPlayerCount; +extern u8 gUnknown_03005DB4; + // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; IWRAM_DATA struct UnkStruct_Group *gUnknown_03000DA4; @@ -122,6 +151,7 @@ void sub_80173E0(u8 windowId, u8 arg1, const u8 *str, u8 arg3, u8 arg4, u8 arg5) u16 ReadAsU16(const u8 *ptr); void sub_8012780(u8 taskId); void sub_80134E8(u8 taskId); +void sub_8013C7C(u8 taskId); void sub_80175EC(struct UnkStruct_Main4 *arg0, u8 count); void sub_8017580(struct UnkStruct_Main0 *arg0, u8 count); u8 sub_8016FC0(struct UnkStruct_Main4 *arg0, u32 arg1); @@ -135,11 +165,17 @@ void sub_80149C4(void); u8 sub_80132D4(struct UnkStruct_Main0 *arg0); void sub_80178A0(u8 arg0, u8 arg1, u8 arg2, struct UnkStruct_x20 *arg3, u8 arg4, u8 id); u32 sub_80176E4(struct UnkStruct_x20 *arg0, struct UnkStruct_x1C *arg1); -void sub_8017734(struct UnkStruct_x20 *arg0, struct UnkStruct_Shared *arg1, u8 arg2); +u8 sub_8017734(struct UnkStruct_x20 *arg0, struct UnkStruct_Shared *arg1, u8 arg2); u8 sub_8013E44(void); u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id); void sub_8013BD8(struct UnkStruct_Group *arg0, s32 id); void sub_80173D4(void); +void sub_80177B8(u8 arg0, u8 arg1, u8 arg2, struct UnkStruct_x20 *arg3, u8 arg4, u8 id); +bool32 sub_8017678(struct UnkStruct_x20 *arg0, struct UnkStruct_x1C *arg1); +u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId); +void sub_801807C(struct TradeUnkStruct *arg0); +void sub_801B940(void); +void sub_801B94C(u16); // const rom data extern const u8 *const gUnknown_082EDB60[][5]; @@ -914,7 +950,7 @@ void sub_80134E8(u8 taskId) id = ListMenuHandleInputGetItemId(data->listTaskId); if (gMain.newKeys & A_BUTTON && id != -1) { - // this unused variable is needed to match + // this unused variable along with the assignment is needed to match u32 unusedVar; unusedVar = data->field_0->arr[id].unk.field_0.unk_0a_0; @@ -1114,3 +1150,348 @@ void sub_80134E8(u8 taskId) break; } } + +u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id) +{ + struct UnkStruct_x20 *structPtr = &arg0->field_0->arr[id]; + + if (gUnknown_02022C2C == 4 && structPtr->unk.field_0.unk_01_2 != 3) + { + if (!(gSaveBlock2Ptr->specialSaveWarp & 0x80)) + return 1; + else if (structPtr->unk.field_0.unk_00_7) + return 0; + } + else + { + return 0; + } + + return 2; +} + +void sub_8013BD8(struct UnkStruct_Group *data, s32 id) +{ + data->field_F = id; + sub_800E0E8(); + CreateWirelessStatusIndicatorSprite(0, 0); + sub_81AE70C(data->listTaskId); + sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]); + sub_8011090(gUnknown_082F0530[gSpecialVar_0x8004], 0, 1); + sub_8011FC8(data->field_0->arr[data->field_F].unk.playerName, ReadAsU16(data->field_0->arr[data->field_F].unk.field_0.playerTrainerId)); +} + +u8 sub_8013C40(void) +{ + u8 taskId; + struct UnkStruct_Group *dataPtr; + + taskId = CreateTask(sub_8013C7C, 0); + gUnknown_02022C30.group = dataPtr = (void*)(gTasks[taskId].data); + + dataPtr->state = 0; + dataPtr->textState = 0; + + gUnknown_03000DA4 = dataPtr; + + return taskId; +} + +void sub_8013C7C(u8 taskId) +{ + struct UnkStruct_Group *data = gUnknown_02022C30.group; + + switch (data->state) + { + case 0: + sub_8010F84(0, 0, 0); + sub_800B488(); + OpenLink(); + sub_8011C5C(); + sub_80111B0(TRUE); + data->field_4 = AllocZeroed(0x70); + data->field_0 = AllocZeroed(0x200); + data->state = 2; + break; + case 2: + sub_80175EC(data->field_4, 4); + sub_8017580(data->field_0, 16); + data->field_11 = sub_8016FC0(data->field_4, 0xFF); + data->field_F = 0; + data->state = 3; + break; + case 3: + if (sub_8013E44() == 1) + PlaySE(SE_PC_LOGIN); + if (gTasks[taskId].data[15] == 0xFF) + data->state = 10; + break; + case 10: + DestroyTask(data->field_11); + Free(data->field_0); + Free(data->field_4); + sub_800EDD4(); + data->state++; + break; + case 11: + sub_800EDD4(); + DestroyTask(taskId); + break; + } +} + +extern const u8 *const gUnknown_082F04D8[22]; + +bool32 sub_8013D88(u32 arg0, u32 id) +{ + if (id == 0xFF) + return TRUE; + + if (id <= ARRAY_COUNT(gUnknown_082F04D8)) // UB: <= may access data outside the array + { + const u8 *bytes = gUnknown_082F04D8[id]; + + while ((*(bytes) != 0xFF)) + { + if ((*bytes) == arg0) + return TRUE; + bytes++; + } + } + + return FALSE; +} + +u8 sub_8013DBC(struct UnkStruct_Group *data, u32 id) +{ + if (data->field_0->arr[id].field_1A_0 == 1) + { + if (data->field_0->arr[id].unk.field_0.unk_0a_7 != 0) + return 3; + else if (data->field_0->arr[id].field_1A_1 != 0) + return 1; + else if (data->field_0->arr[id].field_1B != 0) + return 2; + } + + return 0; +} + +void sub_8013DF4(u8 arg0, u32 id, u8 arg2) +{ + struct UnkStruct_Group *data = gUnknown_02022C30.group; + u8 var = sub_8013DBC(data, id); + + sub_80177B8(arg0, 8, arg2, &data->field_0->arr[id], var, id); +} + +u8 sub_8013E44(void) +{ + struct UnkStruct_Group *data = gUnknown_02022C30.group; + u8 ret = 0; + u8 i; + s32 id; + + for (i = 0; i < 16; i++) + { + if (data->field_0->arr[i].field_1A_0 != 0) + { + id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); + if (id != 0xFF) + { + if (data->field_0->arr[i].field_1A_0 == 1) + { + if (sub_8017678(&data->field_0->arr[i], &data->field_4->arr[id])) + { + data->field_0->arr[i].unk = data->field_4->arr[id].unk0; + data->field_0->arr[i].field_1B = 0x40; + ret = 1; + } + else + { + if (data->field_0->arr[i].field_1B != 0) + { + data->field_0->arr[i].field_1B--; + if (data->field_0->arr[i].field_1B == 0) + ret = 2; + } + } + } + else + { + data->field_0->arr[i].field_1A_0 = 1; + data->field_0->arr[i].field_1B = 0x40; + ret = 1; + } + + data->field_0->arr[i].field_18 = 0; + } + else + { + if (data->field_0->arr[i].field_1A_0 != 2) + { + data->field_0->arr[i].field_18++; + if (data->field_0->arr[i].field_18 >= 300) + { + data->field_0->arr[i].field_1A_0 = 2; + ret = 2; + } + } + } + } + } + + for (id = 0; id < 4; id++) + { + if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != 0xFF) + ret = 1; + } + + return ret; +} + +void sub_8013F60(u8 taskId) +{ + sub_80773AC(); + DestroyTask(taskId); +} + +u8 sub_8013F78(void) +{ + u8 taskId = CreateTask(sub_8013F60, 0); + + return taskId; +} + +extern struct MailStruct gUnknown_020321C0[PARTY_SIZE]; +extern u8 gUnknown_02032298[2]; + +void sub_8013F90(u8 taskId) +{ + u32 monId = sub_8018120(&gUnknown_02022C40, GetMultiplayerId()); + + switch (gTasks[taskId].data[0]) + { + case 0: + gTasks[taskId].data[0]++; + SendBlock(0, &gPlayerParty[monId], sizeof(struct Pokemon)); + break; + case 1: + if (GetBlockReceivedStatus() == 3) + { + gEnemyParty[0] = *(struct Pokemon*)(gBlockRecvBuffer[GetMultiplayerId() ^ 1]); + IncrementGameStat(GAME_STAT_50); + ResetBlockReceivedFlags(); + gTasks[taskId].data[0]++; + } + break; + case 2: + memcpy(gBlockSendBuffer, gSaveBlock1Ptr->mail, sizeof(struct MailStruct) * PARTY_SIZE + 4); + if (SendBlock(0, gBlockSendBuffer, sizeof(struct MailStruct) * PARTY_SIZE + 4)) + gTasks[taskId].data[0]++; + break; + case 3: + if (GetBlockReceivedStatus() == 3) + { + memcpy(gUnknown_020321C0, gBlockRecvBuffer[GetMultiplayerId() ^ 1], sizeof(struct MailStruct) * PARTY_SIZE); + ResetBlockReceivedFlags(); + gUnknown_02032298[0] = monId; + gUnknown_02032298[1] = 6; + gMain.savedCallback = CB2_ReturnToField; + SetMainCallback2(sub_807AE50); + sub_801807C(&gUnknown_02022C40); + DestroyTask(taskId); + } + break; + } +} + +void sub_80140E0(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + if (GetMultiplayerId() == 0) + sub_800A4D8(2); + gTasks[taskId].data[0]++; + break; + case 1: + if (GetBlockReceivedStatus() == sub_800A9D8()) + { + s32 i; + u16 *recvBuff; + + for (i = 0; i < GetLinkPlayerCount(); i++) + { + recvBuff = gBlockRecvBuffer[i]; + sub_80C3120(&gTrainerCards[i], recvBuff, gLinkPlayers[i].version); + } + + if (GetLinkPlayerCount() == 2) + { + recvBuff = gBlockRecvBuffer[GetMultiplayerId() ^ 1]; + sub_801B94C(recvBuff[48]); + } + else + { + sub_801B940(); + } + + ResetBlockReceivedFlags(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80141A4(void) +{ + switch (gMain.state) + { + case 0: + CreateTask(sub_80140E0, 5); + gMain.state++; + break; + case 1: + if (!FuncIsActiveTask(sub_80140E0)) + sub_80C4E74(GetMultiplayerId() ^ 1, CB2_ReturnToField); + break; + } + + RunTasks(); + RunTextPrinters(); + AnimateSprites(); + BuildOamBuffer(); +} + +void sub_8014210(u16 battleFlags) +{ + HealPlayerParty(); + SavePlayerParty(); + LoadPlayerBag(); + gLinkPlayers[0].linkType = 0x2211; + gLinkPlayers[GetMultiplayerId()].lp_field_18 = GetMultiplayerId(); + gLinkPlayers[GetMultiplayerId() ^ 1].lp_field_18 = GetMultiplayerId() ^ 1; + gMain.savedCallback = sub_80B360C; + gBattleTypeFlags = battleFlags; + PlayBattleBGM(); +} + +void sub_8014290(u16 arg0, u16 x, u16 y) +{ + VarSet(VAR_0x4087, arg0); + Overworld_SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); + saved_warp2_set_2(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, x, y); + warp_in(); +} + +void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) +{ + gSpecialVar_0x8004 = arg4; + VarSet(VAR_0x4087, arg4); + gFieldLinkPlayerCount = GetLinkPlayerCount(); + gUnknown_03005DB4 = GetMultiplayerId(); + sub_809D2BC(); + Overworld_SetWarpDestination(mapGroup, mapNum, -1, x, y); + warp_in(); +} diff --git a/src/walda_phrase.c b/src/walda_phrase.c index 0aa6f5aca..4a82be14f 100644 --- a/src/walda_phrase.c +++ b/src/walda_phrase.c @@ -13,7 +13,6 @@ extern const u8 gText_Peekaboo[]; extern u8 *GetWaldaPhrasePtr(void); extern bool32 IsWaldaPhraseEmpty(void); extern void sub_80AF168(void); -extern void CB2_ReturnToField(void); extern void SetWaldaPhrase(const u8 *src); extern void SetWaldaWallpaperPatternId(u8 patternId); extern void SetWaldaWallpaperIconId(u8 iconId); -- cgit v1.2.3 From dbb9cdd424431f597366020da26a972c1db9cabb Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 4 Jun 2018 12:07:32 +0200 Subject: more link stuff --- asm/rom_8011DC0.s | 1200 ------------------------------------------------ include/cable_club.h | 1 + include/link.h | 2 +- include/link_rfu.h | 4 + include/party_menu.h | 1 + include/trainer_card.h | 1 + ld_script.txt | 2 + src/load_save.c | 2 +- src/rom_8011DC0.c | 509 +++++++++++++++++++- 9 files changed, 510 insertions(+), 1212 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index e811bb428..bd5131e2f 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -7,1206 +7,6 @@ - - thumb_func_start sub_8014384 -sub_8014384: @ 8014384 - push {r4,lr} - ldr r0, =gMain - movs r1, 0x87 - lsls r1, 3 - adds r4, r0, r1 - ldrb r0, [r4] - cmp r0, 0 - beq _080143A0 - cmp r0, 0x1 - beq _080143B4 - b _080143C6 - .pool -_080143A0: - ldr r0, =sub_80140E0 - movs r1, 0x5 - bl CreateTask - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - b _080143C6 - .pool -_080143B4: - ldr r0, =sub_80140E0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - bne _080143C6 - ldr r0, =sub_8086074 - bl SetMainCallback2 -_080143C6: - bl RunTasks - bl RunTextPrinters - bl AnimateSprites - bl BuildOamBuffer - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8014384 - - thumb_func_start sub_80143E4 -sub_80143E4: @ 80143E4 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - bl sub_80C30A4 - cmp r5, 0 - beq _080143FE - bl sub_801B39C - adds r1, r4, 0 - adds r1, 0x60 - strh r0, [r1] - b _08014404 -_080143FE: - adds r0, r4, 0 - adds r0, 0x60 - strh r5, [r0] -_08014404: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80143E4 - - thumb_func_start sub_801440C -sub_801440C: @ 801440C - push {r4,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_801B940 - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - subs r0, 0x1 - cmp r0, 0xE - bhi _08014474 - lsls r0, 2 - ldr r1, =_08014434 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08014434: - .4byte _08014470 - .4byte _08014470 - .4byte _08014470 - .4byte _08014470 - .4byte _08014474 - .4byte _08014474 - .4byte _08014474 - .4byte _08014474 - .4byte _08014470 - .4byte _08014470 - .4byte _08014470 - .4byte _08014474 - .4byte _08014470 - .4byte _08014474 - .4byte _08014470 -_08014470: - bl sub_800E3A8 -_08014474: - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - subs r0, 0x1 - cmp r0, 0x50 - bls _08014480 - b _08014764 -_08014480: - lsls r0, 2 - ldr r1, =_08014494 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08014494: - .4byte _080145F4 - .4byte _08014620 - .4byte _0801464C - .4byte _08014678 - .4byte _080146D8 - .4byte _08014764 - .4byte _08014764 - .4byte _080146FC - .4byte _08014714 - .4byte _08014734 - .4byte _0801474C - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014698 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _080145D8 - .4byte _08014764 - .4byte _08014764 - .4byte _080146C4 - .4byte _080146D8 - .4byte _08014764 - .4byte _08014764 - .4byte _080146FC - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _08014764 - .4byte _080145D8 -_080145D8: - bl overworld_free_bg_tilemaps - ldr r1, =gMain - ldr r0, =sub_801AC54 - str r0, [r1, 0x8] - movs r0, 0x3 - bl sub_81B8518 - b _08014764 - .pool -_080145F4: - bl overworld_free_bg_tilemaps - ldr r0, =gBlockSendBuffer - movs r1, 0x1 - bl sub_80143E4 - bl HealPlayerParty - bl SavePlayerParty - bl LoadPlayerBag - movs r0, 0x1 - str r0, [sp] - movs r0, 0x19 - movs r1, 0x18 - movs r2, 0x6 - movs r3, 0x8 - b _080146B0 - .pool -_08014620: - bl overworld_free_bg_tilemaps - bl HealPlayerParty - bl SavePlayerParty - bl LoadPlayerBag - ldr r0, =gBlockSendBuffer - movs r1, 0x1 - bl sub_80143E4 - movs r0, 0x2 - str r0, [sp] - movs r0, 0x19 - movs r1, 0x18 - movs r2, 0x6 - movs r3, 0x8 - b _080146B0 - .pool -_0801464C: - bl overworld_free_bg_tilemaps - bl HealPlayerParty - bl SavePlayerParty - bl LoadPlayerBag - ldr r0, =gBlockSendBuffer - movs r1, 0x1 - bl sub_80143E4 - movs r0, 0x5 - str r0, [sp] - movs r0, 0x19 - movs r1, 0x1B - movs r2, 0x5 - movs r3, 0x8 - b _080146B0 - .pool -_08014678: - ldr r0, =gBlockSendBuffer - movs r1, 0x1 - bl sub_80143E4 - bl overworld_free_bg_tilemaps - movs r0, 0x3 - str r0, [sp] - movs r0, 0x19 - movs r1, 0x19 - movs r2, 0x5 - movs r3, 0x8 - b _080146B0 - .pool -_08014698: - ldr r0, =gBlockSendBuffer - movs r1, 0x1 - bl sub_80143E4 - bl overworld_free_bg_tilemaps - movs r0, 0x4 - str r0, [sp] - movs r0, 0x19 - movs r1, 0x1A - movs r2, 0x8 - movs r3, 0x9 -_080146B0: - bl sub_8014304 - ldr r0, =sub_8014384 - bl SetMainCallback2 - b _08014764 - .pool -_080146C4: - bl overworld_free_bg_tilemaps - ldr r0, =sub_8013F90 - movs r1, 0 - bl CreateTask - b _08014764 - .pool -_080146D8: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080146E8 - bl sub_800ED10 - b _080146F6 -_080146E8: - bl sub_800ED28 - movs r0, 0x45 - movs r1, 0 - movs r2, 0x1 - bl sub_8010F84 -_080146F6: - bl sub_801DD98 - b _08014764 -_080146FC: - ldr r0, =gBlockSendBuffer - movs r1, 0 - bl sub_80143E4 - ldr r0, =sub_80141A4 - bl SetMainCallback2 - b _08014764 - .pool -_08014714: - movs r0, 0x8 - movs r1, 0x5 - movs r2, 0x1 - bl sub_8014290 - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - ldr r1, =CB2_LoadMap - bl sub_802A9A8 - b _08014764 - .pool -_08014734: - movs r0, 0x7 - movs r1, 0x9 - movs r2, 0x1 - bl sub_8014290 - ldr r0, =CB2_LoadMap - bl sub_8020C70 - b _08014764 - .pool -_0801474C: - movs r0, 0x8 - movs r1, 0x5 - movs r2, 0x1 - bl sub_8014290 - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - ldr r1, =CB2_LoadMap - bl sub_802493C -_08014764: - adds r0, r4, 0 - bl DestroyTask - ldr r1, =gSpecialVar_Result - movs r0, 0x1 - strh r0, [r1] - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - cmp r0, 0x44 - beq _0801477C - bl ScriptContext2_Disable -_0801477C: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_801440C - - thumb_func_start sub_8014790 -sub_8014790: @ 8014790 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r7, r0, r1 - ldr r0, =gBlockSendBuffer - mov r9, r0 - movs r1, 0 - ldrsh r0, [r7, r1] - mov r2, r9 - cmp r0, 0x8 - bls _080147B6 - b _080149B2 -_080147B6: - lsls r0, 2 - ldr r1, =_080147CC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080147CC: - .4byte _080147F0 - .4byte _080148CC - .4byte _080148E4 - .4byte _0801491E - .4byte _08014934 - .4byte _0801494A - .4byte _08014986 - .4byte _08014992 - .4byte _0801499C -_080147F0: - ldr r1, =gSpecialVar_Result - movs r0, 0x1 - strh r0, [r1] - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - subs r0, 0xE - cmp r0, 0xE - bhi _080148C2 - lsls r0, 2 - ldr r1, =_08014818 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08014818: - .4byte _08014854 - .4byte _080148C2 - .4byte _080148B8 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148C2 - .4byte _080148B8 - .4byte _080148B8 - .4byte _080148B8 - .4byte _080148B8 - .4byte _080148B8 - .4byte _08014854 -_08014854: - ldr r1, =gLinkPlayers - ldr r0, =0x00002211 - str r0, [r1, 0x14] - movs r2, 0 - mov r8, r2 - mov r0, r8 - strh r0, [r1, 0x18] - movs r0, 0x2 - strh r0, [r1, 0x34] - ldr r6, =gUnknown_0203CEF8 - ldrb r0, [r6] - movs r5, 0x64 - muls r0, r5 - ldr r4, =gBattleScripting + 0x14 - adds r0, r4 - movs r1, 0xB - bl GetMonData - mov r1, r9 - strh r0, [r1] - ldrb r0, [r6, 0x1] - muls r0, r5 - adds r0, r4 - movs r1, 0xB - movs r2, 0 - bl GetMonData - mov r2, r9 - strh r0, [r2, 0x2] - ldr r0, =gMain - mov r1, r8 - str r1, [r0, 0x8] - movs r0, 0x4 - strh r0, [r7] - bl sub_800E3A8 - bl ResetBlockReceivedFlags - b _080149B2 - .pool -_080148B8: - bl sub_800E3A8 - adds r0, r4, 0 - bl DestroyTask -_080148C2: - bl EnableBothScriptContexts - movs r0, 0x1 - strh r0, [r7] - b _080149B2 -_080148CC: - bl ScriptContext1_IsScriptSetUp - lsls r0, 24 - cmp r0, 0 - bne _080149B2 - movs r0, 0x1 - movs r1, 0 - bl FadeScreen - movs r0, 0x2 - strh r0, [r7] - b _080149B2 -_080148E4: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080149B2 - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - cmp r0, 0x1D - bne _08014914 - adds r0, r4, 0 - bl DestroyTask - ldr r0, =sub_80773AC - bl SetMainCallback2 - b _080149B2 - .pool -_08014914: - bl sub_800ADF8 - movs r0, 0x3 - strh r0, [r7] - b _080149B2 -_0801491E: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - beq _080149B2 - adds r0, r4, 0 - bl DestroyTask - bl sub_80149D8 - b _080149B2 -_08014934: - movs r0, 0 - adds r1, r2, 0 - movs r2, 0xE - bl SendBlock - lsls r0, 24 - cmp r0, 0 - beq _080149B2 - movs r0, 0x5 - strh r0, [r7] - b _080149B2 -_0801494A: - bl GetBlockReceivedStatus - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bne _080149B2 - bl ResetBlockReceivedFlags - ldr r0, =gBlockRecvBuffer - movs r2, 0x80 - lsls r2, 1 - adds r1, r0, r2 - bl sub_80B2AF4 - cmp r0, 0 - beq _08014980 - ldr r0, =gSpecialVar_Result - movs r1, 0xB - strh r1, [r0] - movs r0, 0x7 - strh r0, [r7] - b _080149B2 - .pool -_08014980: - movs r0, 0x6 - strh r0, [r7] - b _080149B2 -_08014986: - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask - b _080149B2 -_08014992: - bl sub_800AC34 - movs r0, 0x8 - strh r0, [r7] - b _080149B2 -_0801499C: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _080149B2 - bl sub_800E084 - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask -_080149B2: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8014790 - - thumb_func_start sub_80149C4 -sub_80149C4: @ 80149C4 - push {lr} - ldr r0, =sub_8014790 - movs r1, 0 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80149C4 - - thumb_func_start sub_80149D8 -sub_80149D8: @ 80149D8 - push {lr} - ldr r0, =sub_801440C - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x8] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80149D8 - - thumb_func_start sub_8014A00 -sub_8014A00: @ 8014A00 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =sub_8014A40 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gUnknown_02022C30 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r1, r0 - str r1, [r2] - movs r2, 0 - strb r2, [r1, 0xC] - strb r2, [r1, 0xD] - strb r4, [r1, 0x18] - ldr r0, =gSpecialVar_Result - strh r2, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8014A00 - - thumb_func_start sub_8014A40 -sub_8014A40: @ 8014A40 - push {r4-r6,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gUnknown_02022C30 - ldr r5, [r0] - ldrb r0, [r5, 0xC] - cmp r0, 0x11 - bls _08014A54 - b _08014EF2 -_08014A54: - lsls r0, 2 - ldr r1, =_08014A68 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08014A68: - .4byte _08014AB0 - .4byte _08014AEC - .4byte _08014BBC - .4byte _08014BEC - .4byte _08014BFC - .4byte _08014C4C - .4byte _08014C24 - .4byte _08014C52 - .4byte _08014CF2 - .4byte _08014DBC - .4byte _08014DCC - .4byte _08014DE2 - .4byte _08014DFA - .4byte _08014E16 - .4byte _08014E4E - .4byte _08014E74 - .4byte _08014EA8 - .4byte _08014EE2 -_08014AB0: - ldr r1, =gUnknown_02022C2C - ldrb r0, [r5, 0x18] - strb r0, [r1] - ldr r1, =gUnknown_02022C2D - movs r0, 0x2 - strb r0, [r1] - ldrb r0, [r5, 0x18] - movs r1, 0 - movs r2, 0 - bl sub_8010F84 - movs r0, 0 - movs r1, 0 - bl sub_8010FA0 - bl sub_800B488 - bl OpenLink - movs r0, 0x2 - bl sub_8011C10 - movs r0, 0x1 - strb r0, [r5, 0xC] - b _08014EF2 - .pool -_08014AEC: - movs r0, 0x70 - bl AllocZeroed - str r0, [r5, 0x4] - movs r0, 0xA0 - bl AllocZeroed - str r0, [r5] - movs r0, 0xA0 - bl AllocZeroed - str r0, [r5, 0x8] - ldr r0, [r5, 0x4] - movs r1, 0x4 - bl sub_80175EC - ldr r0, [r5] - movs r1, 0x5 - bl sub_8017580 - ldr r0, [r5] - adds r1, r0, 0 - adds r1, 0x10 - bl sub_800DF90 - ldr r1, [r5] - movs r3, 0 - movs r0, 0 - strh r0, [r1, 0x18] - ldr r2, [r5] - ldrb r1, [r2, 0x1A] - subs r0, 0x4 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x1A] - ldr r2, [r5] - ldrb r1, [r2, 0x1A] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x1A] - ldr r0, [r5] - strb r3, [r0, 0x1B] - ldr r0, [r5, 0x4] - movs r1, 0xFF - bl sub_8016FC0 - strb r0, [r5, 0x17] - ldr r0, =gUnknown_082F011C - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - bl sub_8019930 - lsls r0, 16 - ldr r2, =0x0000ffff - ldr r1, [sp, 0x4] - ands r1, r2 - orrs r1, r0 - ldr r0, =0xffff00ff - ands r1, r0 - movs r0, 0xC0 - lsls r0, 4 - orrs r1, r0 - str r1, [sp, 0x4] - mov r0, sp - bl AddWindow - strb r0, [r5, 0xF] - ldrb r0, [r5, 0xF] - bl sub_8018784 - ldr r0, =gMultiuseListMenuTemplate - adds r2, r0, 0 - ldr r1, =gUnknown_082F015C - ldm r1!, {r3,r4,r6} - stm r2!, {r3,r4,r6} - ldm r1!, {r3,r4,r6} - stm r2!, {r3,r4,r6} - ldrb r1, [r5, 0xF] - strb r1, [r0, 0x10] - movs r1, 0 - movs r2, 0 - bl ListMenuInit - strb r0, [r5, 0x12] - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - strb r0, [r5, 0x13] - b _08014C42 - .pool -_08014BBC: - ldr r0, =gStringVar1 - ldr r2, =gUnknown_082F0048 - ldr r4, =gUnknown_02022C2C - ldrb r1, [r4] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - ldr r0, =gStringVar4 - ldrb r1, [r4] - bl sub_801262C - movs r0, 0x3 - strb r0, [r5, 0xC] - b _08014EF2 - .pool -_08014BEC: - ldr r0, =gStringVar4 - bl sub_8018884 - movs r0, 0x4 - strb r0, [r5, 0xC] - b _08014EF2 - .pool -_08014BFC: - adds r0, r5, 0 - movs r1, 0x5 - movs r2, 0x6 - bl sub_801320C - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08014C14 - b _08014EF2 -_08014C14: - movs r0, 0xD - strb r0, [r5, 0xC] - bl sub_800E084 - b _08014EF2 - .pool -_08014C24: - adds r0, r5, 0 - adds r0, 0xD - ldr r1, =gUnknown_082EDF40 - bl mevent_0814257C - cmp r0, 0 - bne _08014C34 - b _08014EF2 -_08014C34: - ldr r0, [r5] - bl sub_8013398 - strb r0, [r5, 0x13] - ldrb r0, [r5, 0x12] - bl sub_81AE70C -_08014C42: - movs r0, 0x2 - strb r0, [r5, 0xC] - b _08014EF2 - .pool -_08014C4C: - movs r0, 0x7 - strb r0, [r5, 0xC] - b _08014EF2 -_08014C52: - adds r0, r5, 0 - adds r0, 0xD - adds r1, r5, 0 - adds r1, 0x14 - ldr r3, =gStringVar4 - movs r2, 0 - bl sub_8018B08 - lsls r0, 24 - asrs r4, r0, 24 - cmp r4, 0 - beq _08014C82 - cmp r4, 0 - bgt _08014C7C - movs r0, 0x1 - negs r0, r0 - cmp r4, r0 - beq _08014CC4 - b _08014EF2 - .pool -_08014C7C: - cmp r4, 0x1 - beq _08014CC4 - b _08014EF2 -_08014C82: - bl sub_800E0E8 - movs r0, 0 - movs r1, 0 - bl CreateWirelessStatusIndicatorSprite - ldr r1, [r5] - ldrb r0, [r5, 0x13] - lsls r0, 5 - adds r1, r0 - strb r4, [r1, 0x1B] - ldrb r0, [r5, 0x12] - bl sub_81AE70C - movs r0, 0x5 - strb r0, [r5, 0x19] - ldrb r1, [r5, 0x13] - lsls r1, 5 - ldr r0, [r5] - adds r0, r1 - adds r0, 0x2 - bl ReadAsU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldrb r0, [r5, 0x13] - lsls r0, 5 - ldr r2, [r5] - adds r2, r0 - adds r2, 0x10 - movs r0, 0x5 - b _08014CE8 -_08014CC4: - movs r0, 0x6 - strb r0, [r5, 0x19] - ldrb r1, [r5, 0x13] - lsls r1, 5 - ldr r0, [r5] - adds r0, r1 - adds r0, 0x2 - bl ReadAsU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldrb r0, [r5, 0x13] - lsls r0, 5 - ldr r2, [r5] - adds r2, r0 - adds r2, 0x10 - movs r0, 0x6 -_08014CE8: - bl sub_8010688 - movs r0, 0x8 - strb r0, [r5, 0xC] - b _08014EF2 -_08014CF2: - ldrb r1, [r5, 0x13] - lsls r1, 5 - ldr r0, [r5] - adds r0, r1 - adds r0, 0x2 - bl ReadAsU16 - lsls r0, 16 - lsrs r0, 16 - ldrb r2, [r5, 0x13] - lsls r2, 5 - ldr r1, [r5] - adds r1, r2 - adds r1, 0x10 - bl sub_8010714 - adds r4, r0, 0 - cmp r4, 0x1 - bne _08014DAA - ldrb r0, [r5, 0x19] - cmp r0, 0x5 - bne _08014D64 - ldr r1, [r5] - ldrb r0, [r5, 0x13] - lsls r0, 5 - adds r1, r0 - movs r0, 0 - strb r0, [r1, 0x1B] - ldrb r0, [r5, 0x12] - bl sub_81AE70C - ldrb r0, [r5, 0x13] - adds r0, 0x1 - strb r0, [r5, 0x13] - ldr r0, =gStringVar1 - ldrb r2, [r5, 0x13] - lsls r2, 5 - subs r2, 0x20 - ldr r1, [r5] - adds r1, r2 - bl sub_8018404 - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EDC9C - bl StringExpandPlaceholders - movs r0, 0x9 - strb r0, [r5, 0xC] - bl sub_800EF38 - b _08014DA4 - .pool -_08014D64: - ldrb r1, [r5, 0x13] - lsls r1, 5 - ldr r0, [r5] - adds r0, r1 - adds r4, r0, 0 - adds r4, 0x10 - adds r0, 0x2 - bl ReadAsU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl sub_8011DC0 - ldr r1, [r5] - ldrb r0, [r5, 0x13] - lsls r0, 5 - adds r1, r0 - ldrb r2, [r1, 0x1A] - movs r0, 0x4 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x1A] - ldr r0, [r5] - bl sub_8013398 - ldrb r0, [r5, 0x12] - bl sub_81AE70C - movs r0, 0x2 - strb r0, [r5, 0xC] -_08014DA4: - movs r0, 0 - strb r0, [r5, 0x19] - b _08014EF2 -_08014DAA: - cmp r4, 0x2 - beq _08014DB0 - b _08014EF2 -_08014DB0: - movs r0, 0 - movs r1, 0 - bl sub_8011A64 - strb r4, [r5, 0xC] - b _08014EF2 -_08014DBC: - ldr r0, =gStringVar4 - bl sub_8018884 - movs r0, 0xA - strb r0, [r5, 0xC] - b _08014EF2 - .pool -_08014DCC: - ldrb r0, [r5, 0xE] - adds r0, 0x1 - strb r0, [r5, 0xE] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x78 - bhi _08014DDC - b _08014EF2 -_08014DDC: - movs r0, 0xB - strb r0, [r5, 0xC] - b _08014EF2 -_08014DE2: - adds r0, r5, 0 - movs r1, 0x5 - movs r2, 0x6 - bl sub_801320C - lsls r0, 24 - cmp r0, 0 - beq _08014DF4 - b _08014EF2 -_08014DF4: - movs r0, 0xC - strb r0, [r5, 0xC] - b _08014EF2 -_08014DFA: - bl sub_800EF1C - lsls r0, 24 - cmp r0, 0 - beq _08014E10 - movs r0, 0 - bl sub_800EF58 - movs r0, 0xF - strb r0, [r5, 0xC] - b _08014EF2 -_08014E10: - movs r0, 0x6 - strb r0, [r5, 0xC] - b _08014EF2 -_08014E16: - bl sub_800E084 - bl sub_800EDD4 - ldrb r0, [r5, 0x12] - movs r1, 0 - movs r2, 0 - bl DestroyListMenuTask - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrb r0, [r5, 0xF] - bl RemoveWindow - ldrb r0, [r5, 0x17] - bl DestroyTask - ldr r0, [r5, 0x8] - bl Free - ldr r0, [r5] - bl Free - ldr r0, [r5, 0x4] - bl Free - b _08014EDA -_08014E4E: - adds r0, r5, 0 - adds r0, 0xD - ldr r1, =gText_PleaseStartOver - bl mevent_0814257C - cmp r0, 0 - beq _08014EF2 - adds r0, r4, 0 - bl DestroyTask - ldr r1, =gSpecialVar_Result - movs r0, 0x5 - strh r0, [r1] - b _08014EF2 - .pool -_08014E74: - bl sub_8011A74 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08014E8C - bl sub_8011A74 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _08014E92 -_08014E8C: - movs r0, 0xD - strb r0, [r5, 0xC] - b _08014EF2 -_08014E92: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _08014EF2 - movs r0, 0x1 - bl sub_8011068 - b _08014EDA - .pool -_08014EA8: - ldrb r0, [r5, 0x12] - movs r1, 0 - movs r2, 0 - bl DestroyListMenuTask - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrb r0, [r5, 0xF] - bl RemoveWindow - ldrb r0, [r5, 0x17] - bl DestroyTask - ldr r0, [r5, 0x8] - bl Free - ldr r0, [r5] - bl Free - ldr r0, [r5, 0x4] - bl Free - bl sub_800ADF8 -_08014EDA: - ldrb r0, [r5, 0xC] - adds r0, 0x1 - strb r0, [r5, 0xC] - b _08014EF2 -_08014EE2: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - beq _08014EF2 - adds r0, r4, 0 - bl DestroyTask -_08014EF2: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8014A40 - - thumb_func_start sub_8014EFC -sub_8014EFC: @ 8014EFC - push {r4,lr} - adds r4, r0, 0 - ldr r0, =sub_8014F48 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gUnknown_02022C30 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r1, r0 - str r1, [r2] - ldr r0, =gUnknown_03000DA4 - str r1, [r0] - movs r2, 0 - strb r2, [r1, 0x8] - strb r2, [r1, 0x9] - subs r4, 0x15 - strb r4, [r1, 0x12] - ldr r0, =gSpecialVar_Result - strh r2, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8014EFC - thumb_func_start sub_8014F48 sub_8014F48: @ 8014F48 push {r4-r7,lr} diff --git a/include/cable_club.h b/include/cable_club.h index 7b47c9f73..734a4f070 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -10,5 +10,6 @@ void sub_80B37D4(TaskFunc taskFunc); u8 sub_80B3050(void); void sub_80B360C(void); +bool32 sub_80B2AF4(u16 *arg0, u16 *arg1); #endif //GUARD_CABLE_CLUB_H diff --git a/include/link.h b/include/link.h index 5ef1dca4c..5fe614ab3 100644 --- a/include/link.h +++ b/include/link.h @@ -122,7 +122,7 @@ struct LinkPlayer /* 0x08 */ u8 name[11]; /* 0x13 */ u8 gender; /* 0x14 */ u32 linkType; - /* 0x18 */ u16 lp_field_18; // battler id in battles + /* 0x18 */ u16 id; // battler id in battles /* 0x1A */ u16 language; }; diff --git a/include/link_rfu.h b/include/link_rfu.h index 95bae9d06..7a3254632 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -248,7 +248,11 @@ void sub_800E084(void); void sub_801103C(void); void sub_8011C5C(void); void sub_80106D4(void); +void sub_800E3A8(void); +void sub_800ED10(void); +void sub_800ED28(void); void sub_8011090(u8 a0, u32 a1, u32 a2); void sub_8011FC8(u8 *a0, u16 a1); +void sub_8010FA0(bool32 a0, bool32 a1); #endif //GUARD_LINK_RFU_H diff --git a/include/party_menu.h b/include/party_menu.h index c96eb0d9d..b67633c2b 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -38,5 +38,6 @@ void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func); void sub_81B1B5C(void *a, u8 b); u8 sub_81B1BD4(); void sub_81B8448(); +void sub_81B8518(u8 unused); #endif // GUARD_PARTY_MENU_H diff --git a/include/trainer_card.h b/include/trainer_card.h index 6afcba5b1..af603444f 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -34,5 +34,6 @@ extern struct TrainerCard gTrainerCards[4]; void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion); void sub_80C4E74(u8 arg0, void (*callback)(void)); +void sub_80C30A4(u16 *arg0); #endif // GUARD_TRAINER_CARD_H diff --git a/ld_script.txt b/ld_script.txt index f7e531fce..9ca645de4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -55,6 +55,7 @@ SECTIONS { src/link.o(.text); src/link_rfu.o(.text); asm/link_rfu.o(.text); + src/rom_8011DC0.o(.text); asm/rom_8011DC0.o(.text); src/rtc.o(.text); src/main_menu.o(.text); @@ -367,6 +368,7 @@ SECTIONS { src/string_util.o(.rodata); src/link.o(.rodata); src/link_rfu.o(.rodata); + src/rom_8011DC0.o(.rodata); data/rom_8011DC0.o(.rodata); src/rtc.o(.rodata); src/main_menu.o(.rodata); diff --git a/src/load_save.c b/src/load_save.c index 917c1dfe1..ead4c7bb2 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -38,7 +38,7 @@ EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; EWRAM_DATA u8 gSaveblock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0}; -EWRAM_DATA u32 gLastEncryptionKey = {0}; +EWRAM_DATA u32 gLastEncryptionKey = 0; // IWRAM common IWRAM_DATA bool32 gFlashMemoryPresent; diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 514fd49a7..dd162c4a0 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -15,6 +15,7 @@ #include "sound.h" #include "constants/songs.h" #include "constants/game_stat.h" +#include "constants/maps.h" #include "trade.h" #include "trainer_card.h" #include "overworld.h" @@ -22,6 +23,9 @@ #include "load_save.h" #include "cable_club.h" #include "field_control_avatar.h" +#include "party_menu.h" +#include "field_weather.h" +#include "palette.h" extern void HealPlayerParty(void); @@ -30,7 +34,7 @@ struct UnkStruct_Shared struct UnkLinkRfuStruct_02022B14 field_0; u8 field_xD; u8 field_E; - u8 field_F; + u8 field_xF; u8 playerName[PLAYER_NAME_LENGTH]; }; @@ -75,7 +79,7 @@ struct UnkStruct_Leader u8 state; u8 textState; u8 field_E; - u8 field_F; + u8 listWindowId; u8 field_10; u8 field_11; u8 listTaskId; @@ -152,6 +156,8 @@ u16 ReadAsU16(const u8 *ptr); void sub_8012780(u8 taskId); void sub_80134E8(u8 taskId); void sub_8013C7C(u8 taskId); +void sub_8014A40(u8 taskId); +void sub_8014F48(u8 taskId); void sub_80175EC(struct UnkStruct_Main4 *arg0, u8 count); void sub_8017580(struct UnkStruct_Main0 *arg0, u8 count); u8 sub_8016FC0(struct UnkStruct_Main4 *arg0, u32 arg1); @@ -176,6 +182,18 @@ u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId); void sub_801807C(struct TradeUnkStruct *arg0); void sub_801B940(void); void sub_801B94C(u16); +u16 sub_801B39C(void); +void sub_801AC54(void); +void sub_801DD98(void); +void sub_802A9A8(u8 monId, MainCallback callback); +void sub_802493C(u8 monId, MainCallback callback); +void sub_8020C70(MainCallback callback); +void sub_80149D8(void); +u16 sub_8019930(void); +void sub_8018784(u8 windowId); +void sub_8018884(const u8 *src); +bool32 mevent_0814257C(u8 *textState, const u8 *str); +s8 sub_8018B08(u8 *textState, u8 *arg1, u8 arg2, const u8 *str); // const rom data extern const u8 *const gUnknown_082EDB60[][5]; @@ -200,6 +218,8 @@ extern const u8 gUnknown_082EDDF4[]; extern const u8 gUnknown_082EF7DC[]; extern const u8 gUnknown_082EDE48[]; extern const u8 gUnknown_082EDE64[]; +extern const u8 gUnknown_082EDF40[]; +extern const u8 gText_PleaseStartOver[]; extern const u32 gUnknown_082F00C4[]; @@ -342,10 +362,10 @@ void sub_8012780(u8 taskId) case 2: case 3: case 4: - data->field_F = AddWindow(&gUnknown_082F011C); + data->listWindowId = AddWindow(&gUnknown_082F011C); break; case 5: - data->field_F = AddWindow(&gUnknown_082F0124); + data->listWindowId = AddWindow(&gUnknown_082F0124); break; } data->field_11 = AddWindow(&gUnknown_082F012C); @@ -355,9 +375,9 @@ void sub_8012780(u8 taskId) PutWindowTilemap(data->field_10); CopyWindowToVram(data->field_10, 2); - NewMenuHelpers_DrawStdWindowFrame(data->field_F, FALSE); + NewMenuHelpers_DrawStdWindowFrame(data->listWindowId, FALSE); gMultiuseListMenuTemplate = gUnknown_082F015C; - gMultiuseListMenuTemplate.windowId = data->field_F; + gMultiuseListMenuTemplate.windowId = data->listWindowId; data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); NewMenuHelpers_DrawStdWindowFrame(data->field_11, FALSE); @@ -633,10 +653,10 @@ void sub_8012F64(struct UnkStruct_Leader *data) sub_819746C(data->field_11, FALSE); DestroyListMenuTask(data->listTaskId, 0, 0); ClearWindowTilemap(data->field_10); - sub_819746C(data->field_F, FALSE); + sub_819746C(data->listWindowId, FALSE); CopyBgTilemapBufferToVram(0); RemoveWindow(data->field_11); - RemoveWindow(data->field_F); + RemoveWindow(data->listWindowId); RemoveWindow(data->field_10); DestroyTask(data->field_17); @@ -1470,8 +1490,8 @@ void sub_8014210(u16 battleFlags) SavePlayerParty(); LoadPlayerBag(); gLinkPlayers[0].linkType = 0x2211; - gLinkPlayers[GetMultiplayerId()].lp_field_18 = GetMultiplayerId(); - gLinkPlayers[GetMultiplayerId() ^ 1].lp_field_18 = GetMultiplayerId() ^ 1; + gLinkPlayers[GetMultiplayerId()].id = GetMultiplayerId(); + gLinkPlayers[GetMultiplayerId() ^ 1].id = GetMultiplayerId() ^ 1; gMain.savedCallback = sub_80B360C; gBattleTypeFlags = battleFlags; PlayBattleBGM(); @@ -1495,3 +1515,472 @@ void sub_8014304(s8 mapGroup, s8 mapNum, s32 x, s32 y, u16 arg4) Overworld_SetWarpDestination(mapGroup, mapNum, -1, x, y); warp_in(); } + +void sub_8014384(void) +{ + switch (gMain.state) + { + case 0: + CreateTask(sub_80140E0, 5); + gMain.state++; + break; + case 1: + if (!FuncIsActiveTask(sub_80140E0)) + SetMainCallback2(sub_8086074); + break; + } + + RunTasks(); + RunTextPrinters(); + AnimateSprites(); + BuildOamBuffer(); +} + +void sub_80143E4(void *arg0, bool32 arg1) +{ + u16 *argAsU16Ptr = arg0; + + sub_80C30A4(argAsU16Ptr); + if (arg1) + argAsU16Ptr[48] = sub_801B39C(); + else + argAsU16Ptr[48] = 0; +} + +void sub_801440C(u8 taskId) +{ + sub_801B940(); + switch (gUnknown_02022C2C) + { + case 1 ... 4: + case 9 ... 11: + case 13: + case 15: + sub_800E3A8(); + break; + } + + switch (gUnknown_02022C2C) + { + case 65: + case 81: + overworld_free_bg_tilemaps(); + gMain.savedCallback = sub_801AC54; + sub_81B8518(3); + break; + case 1: + overworld_free_bg_tilemaps(); + sub_80143E4(gBlockSendBuffer, TRUE); + HealPlayerParty(); + SavePlayerParty(); + LoadPlayerBag(); + sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, 1); + SetMainCallback2(sub_8014384); + break; + case 2: + overworld_free_bg_tilemaps(); + HealPlayerParty(); + SavePlayerParty(); + LoadPlayerBag(); + sub_80143E4(gBlockSendBuffer, TRUE); + sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, 2); + SetMainCallback2(sub_8014384); + break; + case 3: + overworld_free_bg_tilemaps(); + HealPlayerParty(); + SavePlayerParty(); + LoadPlayerBag(); + sub_80143E4(gBlockSendBuffer, TRUE); + sub_8014304(MAP_GROUP(DOUBLE_BATTLE_COLOSSEUM), MAP_NUM(DOUBLE_BATTLE_COLOSSEUM), 5, 8, 5); + SetMainCallback2(sub_8014384); + break; + case 4: + sub_80143E4(gBlockSendBuffer, TRUE); + overworld_free_bg_tilemaps(); + sub_8014304(MAP_GROUP(TRADE_CENTER), MAP_NUM(TRADE_CENTER), 5, 8, 3); + SetMainCallback2(sub_8014384); + break; + case 15: + sub_80143E4(gBlockSendBuffer, TRUE); + overworld_free_bg_tilemaps(); + sub_8014304(MAP_GROUP(RECORD_CORNER), MAP_NUM(RECORD_CORNER), 8, 9, 4); + SetMainCallback2(sub_8014384); + break; + case 68: + overworld_free_bg_tilemaps(); + CreateTask(sub_8013F90, 0); + break; + case 5: + case 69: + if (GetMultiplayerId() == 0) + { + sub_800ED10(); + } + else + { + sub_800ED28(); + sub_8010F84(69, 0, 1); + } + sub_801DD98(); + break; + case 8: + case 72: + sub_80143E4(gBlockSendBuffer, FALSE); + SetMainCallback2(sub_80141A4); + break; + case 9: + sub_8014290(8, 5, 1); + sub_802A9A8(GetCursorSelectionMonId(), CB2_LoadMap); + break; + case 10: + sub_8014290(7, 9, 1); + sub_8020C70(CB2_LoadMap); + break; + case 11: + sub_8014290(8, 5, 1); + sub_802493C(GetCursorSelectionMonId(), CB2_LoadMap); + break; + } + + DestroyTask(taskId); + gSpecialVar_Result = 1; + if (gUnknown_02022C2C != 68) + ScriptContext2_Disable(); +} + +extern u8 gUnknown_0203CEF8[]; + +void sub_8014790(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + u16 *sendBuff = (u16*)(gBlockSendBuffer); + + switch (data[0]) + { + case 0: + gSpecialVar_Result = 1; + switch (gUnknown_02022C2C) + { + case 14: + case 28: + gLinkPlayers[0].linkType = 0x2211; + gLinkPlayers[0].id = 0; + gLinkPlayers[1].id = 2; + sendBuff[0] = GetMonData(&gPlayerParty[gUnknown_0203CEF8[0] - 1], MON_DATA_SPECIES); + sendBuff[1] = GetMonData(&gPlayerParty[gUnknown_0203CEF8[1] - 1], MON_DATA_SPECIES, NULL); + gMain.savedCallback = NULL; + data[0] = 4; + sub_800E3A8(); + ResetBlockReceivedFlags(); + break; + case 16: + case 23 ... 27: + sub_800E3A8(); + DestroyTask(taskId); + default: + EnableBothScriptContexts(); + data[0] = 1; + break; + } + break; + case 1: + if (!ScriptContext1_IsScriptSetUp()) + { + FadeScreen(1, 0); + data[0] = 2; + } + break; + case 2: + if (!gPaletteFade.active) + { + if (gUnknown_02022C2C == 29) + { + DestroyTask(taskId); + SetMainCallback2(sub_80773AC); + } + else + { + sub_800ADF8(); + data[0] = 3; + } + } + break; + case 3: + if (sub_800A520()) + { + DestroyTask(taskId); + sub_80149D8(); + } + break; + case 4: + if (SendBlock(0, gBlockSendBuffer, 0xE)) + data[0] = 5; + break; + case 5: + if (GetBlockReceivedStatus() == 3) + { + ResetBlockReceivedFlags(); + if (sub_80B2AF4(gBlockRecvBuffer[0], gBlockRecvBuffer[1])) + { + gSpecialVar_Result = 11; + data[0] = 7; + } + else + { + data[0] = 6; + } + } + break; + case 6: + EnableBothScriptContexts(); + DestroyTask(taskId); + break; + case 7: + sub_800AC34(); + data[0] = 8; + break; + case 8: + if (gReceivedRemoteLinkPlayers == 0) + { + sub_800E084(); + EnableBothScriptContexts(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80149C4(void) +{ + CreateTask(sub_8014790, 0); +} + +void sub_80149D8(void) +{ + u8 taskId = CreateTask(sub_801440C, 0); + gTasks[taskId].data[0] = 0; +} + +void sub_8014A00(u32 arg0) +{ + u8 taskId; + struct UnkStruct_Leader *dataPtr; + + taskId = CreateTask(sub_8014A40, 0); + gUnknown_02022C30.leader = dataPtr = (void*)(gTasks[taskId].data); + + dataPtr->state = 0; + dataPtr->textState = 0; + dataPtr->field_18 = arg0; + gSpecialVar_Result = 0; +} + +void sub_8014A40(u8 taskId) +{ + struct UnkStruct_Leader *data = gUnknown_02022C30.leader; + struct WindowTemplate winTemplate; + s32 val; + + switch (data->state) + { + case 0: + gUnknown_02022C2C = data->field_18; + gUnknown_02022C2D = 2; + sub_8010F84(data->field_18, 0, 0); + sub_8010FA0(FALSE, FALSE); + sub_800B488(); + OpenLink(); + sub_8011C10(2); + data->state = 1; + break; + case 1: + data->field_4 = AllocZeroed(0x70); + data->field_0 = AllocZeroed(0xA0); + data->field_8 = AllocZeroed(0xA0); + sub_80175EC(data->field_4, 4); + sub_8017580(data->field_0, 5); + sub_800DF90(&data->field_0->arr[0].unk.field_0, data->field_0->arr[0].unk.playerName); + data->field_0->arr[0].field_18 = 0; + data->field_0->arr[0].field_1A_0 = 1; + data->field_0->arr[0].field_1A_1 = 0; + data->field_0->arr[0].field_1B = 0; + data->field_17 = sub_8016FC0(data->field_4, 0xFF); + + winTemplate = gUnknown_082F011C; + winTemplate.baseBlock = sub_8019930(); + winTemplate.paletteNum = 0xC; + data->listWindowId = AddWindow(&winTemplate); + sub_8018784(data->listWindowId); + gMultiuseListMenuTemplate = gUnknown_082F015C; + gMultiuseListMenuTemplate.windowId = data->listWindowId; + data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); + + CopyBgTilemapBufferToVram(0); + data->field_13 = 1; + data->state = 2; + break; + case 2: + StringCopy(gStringVar1, gUnknown_082F0048[gUnknown_02022C2C]); + sub_801262C(gStringVar4, gUnknown_02022C2C); + data->state = 3; + break; + case 3: + sub_8018884(gStringVar4); + data->state = 4; + break; + case 4: + sub_801320C(data, 5, 6); + if (gMain.newKeys & B_BUTTON) + { + data->state = 13; + sub_800E084(); + } + break; + case 6: + if (mevent_0814257C(&data->textState, gUnknown_082EDF40)) + { + data->field_13 = sub_8013398(data->field_0); + sub_81AE70C(data->listTaskId); + data->state = 2; + } + break; + case 5: + data->state = 7; + break; + case 7: + switch (sub_8018B08(&data->textState, &data->field_14, 0, gStringVar4)) + { + case 0: + sub_800E0E8(); + CreateWirelessStatusIndicatorSprite(0, 0); + data->field_0->arr[data->field_13].field_1B = 0; + sub_81AE70C(data->listTaskId); + data->field_19 = 5; + sub_8010688(5, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + data->state = 8; + break; + case 1: + case -1: + data->field_19 = 6; + sub_8010688(6, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + data->state = 8; + break; + } + break; + case 8: + val = sub_8010714(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + if (val == 1) + { + if (data->field_19 == 5) + { + data->field_0->arr[data->field_13].field_1B = 0; + sub_81AE70C(data->listTaskId); + data->field_13++; + sub_8018404(gStringVar1, &data->field_0->arr[data->field_13 - 1]); + StringExpandPlaceholders(gStringVar4, gUnknown_082EDC9C); + data->state = 9; + sub_800EF38(); + } + else + { + sub_8011DC0(data->field_0->arr[data->field_13].unk.playerName, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId)); + data->field_0->arr[data->field_13].field_1A_0 = 0; + sub_8013398(data->field_0); + sub_81AE70C(data->listTaskId); + data->state = 2; + } + + data->field_19 = 0; + } + else if (val == 2) + { + sub_8011A64(0, 0); + data->state = 2; + } + break; + case 9: + sub_8018884(gStringVar4); + data->state = 10; + break; + case 10: + if (++data->field_E > 120) + data->state = 11; + break; + case 11: + if (!sub_801320C(data, 5, 6)) + data->state = 12; + break; + case 12: + if (sub_800EF1C()) + { + sub_800EF58(FALSE); + data->state = 15; + } + else + { + data->state = 6; + } + break; + case 13: + sub_800E084(); + sub_800EDD4(); + DestroyListMenuTask(data->listTaskId, 0, 0); + CopyBgTilemapBufferToVram(0); + RemoveWindow(data->listWindowId); + DestroyTask(data->field_17); + Free(data->field_8); + Free(data->field_0); + Free(data->field_4); + data->state++; + break; + case 14: + if (mevent_0814257C(&data->textState, gText_PleaseStartOver)) + { + DestroyTask(taskId); + gSpecialVar_Result = 5; + } + break; + case 15: + if (sub_8011A74() == 1 || sub_8011A74() == 2) + { + data->state = 13; + } + else if (gReceivedRemoteLinkPlayers != 0) + { + sub_8011068(1); + data->state++; + } + break; + case 16: + DestroyListMenuTask(data->listTaskId, 0, 0); + CopyBgTilemapBufferToVram(0); + RemoveWindow(data->listWindowId); + DestroyTask(data->field_17); + Free(data->field_8); + Free(data->field_0); + Free(data->field_4); + sub_800ADF8(); + data->state++; + break; + case 17: + if (sub_800A520()) + DestroyTask(taskId); + break; + } +} + +void sub_8014EFC(u32 arg0) +{ + u8 taskId; + struct UnkStruct_Group *dataPtr; + + taskId = CreateTask(sub_8014F48, 0); + gUnknown_02022C30.group = dataPtr = (void*)(gTasks[taskId].data); + gUnknown_03000DA4 = dataPtr; + + dataPtr->state = 0; + dataPtr->textState = 0; + dataPtr->field_12 = arg0 - 21; + gSpecialVar_Result = 0; +} -- cgit v1.2.3 From 7b72cfdc6cd380326deb3cbed6802f5db11c31d4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 4 Jun 2018 23:32:28 +0200 Subject: through sub_80156C8 --- asm/rom_8011DC0.s | 837 +----------------------------------------------------- src/rom_8011DC0.c | 435 +++++++++++++++++++++++++++- 2 files changed, 427 insertions(+), 845 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index bd5131e2f..b450d811d 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -4,843 +4,8 @@ .syntax unified .text - - - - thumb_func_start sub_8014F48 -sub_8014F48: @ 8014F48 - push {r4-r7,lr} - sub sp, 0x10 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, =gUnknown_02022C30 - ldr r7, [r0] - ldrb r0, [r7, 0x8] - cmp r0, 0xC - bls _08014F5C - b _080152A0 -_08014F5C: - lsls r0, 2 - ldr r1, =_08014F70 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08014F70: - .4byte _08014FA4 - .4byte _08014FD8 - .4byte _08014FE8 - .4byte _080150B8 - .4byte _08015180 - .4byte _080151A4 - .4byte _08015204 - .4byte _08015260 - .4byte _08015204 - .4byte _0801523A - .4byte _08015204 - .4byte _08015284 - .4byte _08015290 -_08014FA4: - ldrb r0, [r7, 0x12] - adds r0, 0x15 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - movs r2, 0 - bl sub_8010F84 - bl sub_800B488 - bl OpenLink - bl sub_8011C5C - movs r0, 0x70 - bl AllocZeroed - str r0, [r7, 0x4] - movs r0, 0x80 - lsls r0, 2 - bl AllocZeroed - str r0, [r7] - movs r0, 0x1 - strb r0, [r7, 0x8] - b _080152A0 -_08014FD8: - ldr r0, =gUnknown_082EF7F8 - bl sub_8018884 - movs r0, 0x2 - strb r0, [r7, 0x8] - b _080152A0 - .pool -_08014FE8: - ldr r0, [r7, 0x4] - movs r1, 0x4 - bl sub_80175EC - ldr r0, [r7] - movs r1, 0x10 - bl sub_8017580 - ldr r0, [r7, 0x4] - ldrb r1, [r7, 0x12] - adds r1, 0x7 - bl sub_8016FC0 - movs r6, 0 - strb r0, [r7, 0x11] - ldr r0, =gUnknown_082F0174 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - bl sub_8019930 - lsls r0, 16 - ldr r2, =0x0000ffff - ldr r1, [sp, 0x4] - ands r1, r2 - orrs r1, r0 - ldr r5, =0xffff00ff - ands r1, r5 - movs r4, 0xC0 - lsls r4, 4 - orrs r1, r4 - str r1, [sp, 0x4] - mov r0, sp - bl AddWindow - strb r0, [r7, 0xB] - ldr r0, =gUnknown_082F017C - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x8] - str r1, [sp, 0xC] - add r0, sp, 0x8 - ldr r1, [r0, 0x4] - ands r1, r5 - orrs r1, r4 - str r1, [r0, 0x4] - bl AddWindow - strb r0, [r7, 0xD] - ldrb r0, [r7, 0xB] - bl sub_8018784 - ldr r0, =gMultiuseListMenuTemplate - adds r2, r0, 0 - ldr r1, =gUnknown_082F0204 - ldm r1!, {r3-r5} - stm r2!, {r3-r5} - ldm r1!, {r3-r5} - stm r2!, {r3-r5} - ldrb r1, [r7, 0xB] - strb r1, [r0, 0x10] - movs r1, 0 - movs r2, 0 - bl ListMenuInit - strb r0, [r7, 0xE] - ldrb r0, [r7, 0xD] - bl sub_8018784 - ldrb r0, [r7, 0xD] - movs r1, 0x11 - bl FillWindowPixelBuffer - ldrb r0, [r7, 0xD] - bl PutWindowTilemap - ldrb r0, [r7, 0xD] - bl sub_80125BC - ldrb r0, [r7, 0xD] - movs r1, 0x2 - bl CopyWindowToVram - movs r0, 0 - bl CopyBgTilemapBufferToVram - strb r6, [r7, 0xF] - movs r0, 0x3 - strb r0, [r7, 0x8] - b _080152A0 - .pool -_080150B8: - bl sub_8013E44 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0 - beq _080150D6 - cmp r2, 0x1 - bne _080150CE - movs r0, 0x2 - bl PlaySE -_080150CE: - ldrb r0, [r7, 0xE] - bl sub_81AE70C - b _080152A0 -_080150D6: - ldrb r0, [r7, 0xE] - bl ListMenuHandleInputGetItemId - adds r2, r0, 0 - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08015168 - movs r0, 0x1 - negs r0, r0 - cmp r2, r0 - beq _08015168 - ldr r0, [r7] - lsls r1, r2, 5 - adds r0, r1 - ldrb r1, [r0, 0xA] - ldrb r0, [r0, 0x1A] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _08015160 - lsrs r0, r1, 7 - cmp r0, 0 - bne _08015160 - strb r2, [r7, 0xF] - bl sub_800E0E8 - movs r0, 0 - movs r1, 0 - bl CreateWirelessStatusIndicatorSprite - ldrb r0, [r7, 0xE] - bl sub_81AE70C - ldr r0, =gStringVar1 - ldrb r2, [r7, 0xF] - lsls r2, 5 - ldr r1, [r7] - adds r1, r2 - bl sub_8018404 - ldrb r1, [r7, 0xF] - lsls r1, 5 - ldr r0, [r7] - adds r0, r1 - adds r4, r0, 0 - adds r4, 0x10 - adds r0, 0x2 - bl ReadAsU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl sub_8011FC8 - movs r0, 0x6E - bl PlaySE - movs r0, 0x4 - strb r0, [r7, 0x8] - b _080152A0 - .pool -_08015160: - movs r0, 0x7 - bl PlaySE - b _080152A0 -_08015168: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08015176 - b _080152A0 -_08015176: - movs r0, 0x6 - strb r0, [r7, 0x8] - b _080152A0 - .pool -_08015180: - ldr r0, =gUnknown_082EFC3C - bl sub_8018884 - ldr r0, =gStringVar1 - ldrb r2, [r7, 0xF] - lsls r2, 5 - ldr r1, [r7] - adds r1, r2 - bl sub_8018404 - movs r0, 0x5 - strb r0, [r7, 0x8] - b _080152A0 - .pool -_080151A4: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _080151C2 - ldr r2, =gUnknown_02022C2C - ldr r1, [r7] - ldrb r0, [r7, 0xF] - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1, 0xA] - lsls r0, 25 - lsrs r0, 25 - strb r0, [r2] - movs r0, 0xA - strb r0, [r7, 0x8] -_080151C2: - bl sub_8011A74 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - beq _080151EE - cmp r0, 0x5 - bgt _080151E4 - cmp r0, 0x2 - bgt _080152A0 - cmp r0, 0x1 - blt _080152A0 - b _080151E8 - .pool -_080151E4: - cmp r0, 0x6 - bne _080152A0 -_080151E8: - movs r0, 0x8 - strb r0, [r7, 0x8] - b _080152A0 -_080151EE: - ldr r0, =gUnknown_082EDDF4 - bl sub_8018884 - movs r0, 0 - movs r1, 0 - bl sub_8011A64 - b _080152A0 - .pool -_08015204: - ldrb r0, [r7, 0xE] - movs r1, 0 - movs r2, 0 - bl DestroyListMenuTask - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrb r0, [r7, 0xD] - bl RemoveWindow - ldrb r0, [r7, 0xB] - bl RemoveWindow - ldrb r0, [r7, 0x11] - bl DestroyTask - ldr r0, [r7] - bl Free - ldr r0, [r7, 0x4] - bl Free - ldrb r0, [r7, 0x8] - adds r0, 0x1 - strb r0, [r7, 0x8] - b _080152A0 -_0801523A: - adds r5, r7, 0 - adds r5, 0x9 - ldr r4, =gUnknown_082EDF80 - bl sub_8011A74 - lsls r0, 24 - lsrs r0, 22 - adds r0, r4 - ldr r1, [r0] - adds r0, r5, 0 - bl mevent_0814257C - cmp r0, 0 - beq _080152A0 - bl sub_800E084 - b _0801526A - .pool -_08015260: - bl sub_800E084 - ldr r0, =gText_PleaseStartOver - bl sub_8018884 -_0801526A: - adds r0, r6, 0 - bl DestroyTask - bl sub_800EDD4 - ldr r1, =gSpecialVar_Result - movs r0, 0x5 - strh r0, [r1] - b _080152A0 - .pool -_08015284: - ldrb r0, [r7, 0x8] - adds r0, 0x1 - strb r0, [r7, 0x8] - bl sub_800ADF8 - b _080152A0 -_08015290: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - beq _080152A0 - adds r0, r6, 0 - bl DestroyTask -_080152A0: - add sp, 0x10 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8014F48 - - thumb_func_start sub_80152A8 -sub_80152A8: @ 80152A8 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =task00_081182DC - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gUnknown_02022C30 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r1, r0 - str r1, [r2] - ldr r0, =gUnknown_03000DA4 - str r1, [r0] - movs r2, 0 - strb r2, [r1, 0x8] - strb r2, [r1, 0x9] - subs r4, 0x15 - strb r4, [r1, 0x12] - ldr r0, =gSpecialVar_Result - strh r2, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80152A8 - - thumb_func_start task00_081182DC -task00_081182DC: @ 80152F4 - push {r4-r6,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gUnknown_02022C30 - ldr r5, [r0] - ldrb r0, [r5, 0x8] - cmp r0, 0xE - bls _08015308 - b _08015604 -_08015308: - lsls r0, 2 - ldr r1, =_0801531C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0801531C: - .4byte _08015358 - .4byte _08015386 - .4byte _08015398 - .4byte _08015420 - .4byte _080154E0 - .4byte _08015504 - .4byte _08015564 - .4byte _080155A8 - .4byte _08015564 - .4byte _0801559A - .4byte _08015564 - .4byte _080155B4 - .4byte _08015564 - .4byte _080155E8 - .4byte _080155F4 -_08015358: - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010F84 - bl sub_800B488 - bl OpenLink - bl sub_8011C5C - movs r0, 0x70 - bl AllocZeroed - str r0, [r5, 0x4] - movs r0, 0x80 - lsls r0, 2 - bl AllocZeroed - str r0, [r5] - movs r0, 0x1 - strb r0, [r5, 0x8] - b _08015604 -_08015386: - ldr r0, =gUnknown_082EFBC8 - bl sub_8018884 - movs r0, 0x2 - strb r0, [r5, 0x8] - b _08015604 - .pool -_08015398: - ldr r0, [r5, 0x4] - movs r1, 0x4 - bl sub_80175EC - ldr r0, [r5] - movs r1, 0x10 - bl sub_8017580 - ldr r0, [r5, 0x4] - ldrb r1, [r5, 0x12] - adds r1, 0x7 - bl sub_8016FF0 - strb r0, [r5, 0x11] - ldrb r0, [r5, 0x13] - cmp r0, 0 - beq _08015404 - ldr r0, =gUnknown_082F0174 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - bl sub_8019930 - lsls r0, 16 - ldr r2, =0x0000ffff - ldr r1, [sp, 0x4] - ands r1, r2 - orrs r1, r0 - str r1, [sp, 0x4] - mov r0, sp - bl AddWindow - strb r0, [r5, 0xB] - ldrb r0, [r5, 0xB] - bl sub_8018784 - ldr r0, =gMultiuseListMenuTemplate - adds r2, r0, 0 - ldr r1, =gUnknown_082F0204 - ldm r1!, {r3,r4,r6} - stm r2!, {r3,r4,r6} - ldm r1!, {r3,r4,r6} - stm r2!, {r3,r4,r6} - ldrb r1, [r5, 0xB] - strb r1, [r0, 0x10] - movs r1, 0 - movs r2, 0 - bl ListMenuInit - strb r0, [r5, 0xE] - movs r0, 0 - bl CopyBgTilemapBufferToVram -_08015404: - movs r0, 0 - strb r0, [r5, 0xF] - movs r0, 0x3 - strb r0, [r5, 0x8] - b _08015604 - .pool -_08015420: - bl sub_8013E44 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _08015446 - cmp r0, 0x1 - bne _08015436 - movs r0, 0x2 - bl PlaySE -_08015436: - ldrb r0, [r5, 0x13] - cmp r0, 0 - bne _0801543E - b _08015604 -_0801543E: - ldrb r0, [r5, 0xE] - bl sub_81AE70C - b _08015604 -_08015446: - ldrb r0, [r5, 0x13] - cmp r0, 0 - beq _08015452 - ldrb r0, [r5, 0xE] - bl ListMenuHandleInputGetItemId -_08015452: - ldrb r0, [r5, 0x14] - cmp r0, 0x78 - bls _080154C0 - ldr r2, [r5] - ldrb r1, [r2, 0x1A] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _080154D4 - ldrb r1, [r2, 0xA] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _080154D4 - ldrb r1, [r5, 0x12] - adds r1, 0x7 - adds r0, r2, 0 - bl sub_8016F1C - cmp r0, 0 - beq _080154B4 - strb r4, [r5, 0xF] - strb r4, [r5, 0x14] - bl sub_800E0E8 - movs r0, 0 - movs r1, 0 - bl CreateWirelessStatusIndicatorSprite - ldr r0, [r5] - adds r4, r0, 0 - adds r4, 0x10 - adds r0, 0x2 - bl ReadAsU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl sub_8011FC8 - movs r0, 0x6E - bl PlaySE - movs r0, 0x4 - strb r0, [r5, 0x8] - b _080154D4 -_080154B4: - movs r0, 0x16 - bl PlaySE - movs r0, 0xA - strb r0, [r5, 0x8] - b _080154D4 -_080154C0: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080154D4 - movs r1, 0 - movs r0, 0x6 - strb r0, [r5, 0x8] - strb r1, [r5, 0x14] -_080154D4: - ldrb r0, [r5, 0x14] - adds r0, 0x1 - strb r0, [r5, 0x14] - b _08015604 - .pool -_080154E0: - ldr r0, =gUnknown_082EFC90 - bl sub_8018884 - ldr r0, =gStringVar1 - ldrb r2, [r5, 0xF] - lsls r2, 5 - ldr r1, [r5] - adds r1, r2 - bl sub_8018404 - movs r0, 0x5 - strb r0, [r5, 0x8] - b _08015604 - .pool -_08015504: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _08015522 - ldr r2, =gUnknown_02022C2C - ldr r1, [r5] - ldrb r0, [r5, 0xF] - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1, 0xA] - lsls r0, 25 - lsrs r0, 25 - strb r0, [r2] - movs r0, 0xC - strb r0, [r5, 0x8] -_08015522: - bl sub_8011A74 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - beq _0801554E - cmp r0, 0x5 - bgt _08015544 - cmp r0, 0x2 - bgt _08015604 - cmp r0, 0x1 - blt _08015604 - b _08015548 - .pool -_08015544: - cmp r0, 0x6 - bne _08015604 -_08015548: - movs r0, 0x8 - strb r0, [r5, 0x8] - b _08015604 -_0801554E: - ldr r0, =gUnknown_082EDEC4 - bl sub_8018884 - movs r0, 0 - movs r1, 0 - bl sub_8011A64 - b _08015604 - .pool -_08015564: - ldrb r0, [r5, 0x13] - cmp r0, 0 - beq _08015580 - ldrb r0, [r5, 0xE] - movs r1, 0 - movs r2, 0 - bl DestroyListMenuTask - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldrb r0, [r5, 0xB] - bl RemoveWindow -_08015580: - ldrb r0, [r5, 0x11] - bl DestroyTask - ldr r0, [r5] - bl Free - ldr r0, [r5, 0x4] - bl Free - ldrb r0, [r5, 0x8] - adds r0, 0x1 - strb r0, [r5, 0x8] - b _08015604 -_0801559A: - adds r0, r5, 0 - adds r0, 0x9 - ldr r1, =gUnknown_082EDF04 - b _080155C2 - .pool -_080155A8: - adds r0, r5, 0 - adds r0, 0x9 - ldr r1, =gText_WirelessSearchCanceled - b _080155C2 - .pool -_080155B4: - adds r0, r5, 0 - adds r0, 0x9 - ldr r2, =gUnknown_082EFD58 - ldrb r1, [r5, 0x12] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] -_080155C2: - bl mevent_0814257C - cmp r0, 0 - beq _08015604 - bl sub_800E084 - adds r0, r4, 0 - bl DestroyTask - bl sub_800EDD4 - ldr r1, =gSpecialVar_Result - movs r0, 0x5 - strh r0, [r1] - b _08015604 - .pool -_080155E8: - ldrb r0, [r5, 0x8] - adds r0, 0x1 - strb r0, [r5, 0x8] - bl sub_800ADF8 - b _08015604 -_080155F4: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - beq _08015604 - adds r0, r4, 0 - bl DestroyTask -_08015604: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end task00_081182DC - - thumb_func_start UnionRoomSpecial -UnionRoomSpecial: @ 801560C - push {r4,lr} - bl sub_8010F60 - ldr r0, =sub_80156E0 - movs r1, 0xA - bl CreateTask - ldr r4, =gUnknown_02022C30 - movs r0, 0x9B - lsls r0, 2 - bl AllocZeroed - str r0, [r4] - ldr r1, =gUnknown_03000DA8 - str r0, [r1] - movs r1, 0 - strb r1, [r0, 0x14] - strb r1, [r0, 0x16] - strh r1, [r0, 0x10] - strh r1, [r0, 0x12] - ldr r0, =gSpecialVar_Result - strh r1, [r0] - movs r0, 0xD0 - movs r1, 0x1 - bl sub_819A2BC - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end UnionRoomSpecial - - thumb_func_start ReadAsU16 -ReadAsU16: @ 8015658 - ldrb r1, [r0, 0x1] - lsls r1, 8 - ldrb r0, [r0] - orrs r0, r1 - bx lr - thumb_func_end ReadAsU16 - - thumb_func_start sub_8015664 -sub_8015664: @ 8015664 - push {lr} - adds r3, r1, 0 - ldr r1, =gUnknown_02022C30 - ldr r2, [r1] - movs r1, 0x8 - strb r1, [r2, 0x14] - strb r0, [r2, 0x15] - ldr r0, =gStringVar4 - cmp r3, r0 - beq _0801567E - adds r1, r3, 0 - bl StringExpandPlaceholders -_0801567E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8015664 - - thumb_func_start sub_801568C -sub_801568C: @ 801568C - push {lr} - adds r2, r0, 0 - ldr r0, =gUnknown_02022C30 - ldr r1, [r0] - movs r0, 0x1A - strb r0, [r1, 0x14] - ldr r0, =gStringVar4 - cmp r2, r0 - beq _080156A4 - adds r1, r2, 0 - bl StringExpandPlaceholders -_080156A4: - pop {r0} - bx r0 - .pool - thumb_func_end sub_801568C - - thumb_func_start sub_80156B0 -sub_80156B0: @ 80156B0 - push {lr} - ldr r3, =0x0201ff00 - ldr r1, [r0] - movs r2, 0x80 - lsls r2, 1 - adds r0, r3, 0 - bl memcpy - pop {r0} - bx r0 - .pool - thumb_func_end sub_80156B0 - thumb_func_start sub_80156C8 -sub_80156C8: @ 80156C8 - push {lr} - ldr r0, [r0] - ldr r1, =0x0201ff00 - movs r2, 0x80 - lsls r2, 1 - bl memcpy - pop {r0} - bx r0 - .pool - thumb_func_end sub_80156C8 + thumb_func_start sub_80156E0 sub_80156E0: @ 80156E0 diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index dd162c4a0..d3902f208 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -26,6 +26,7 @@ #include "party_menu.h" #include "field_weather.h" #include "palette.h" +#include "decompress.h" extern void HealPlayerParty(void); @@ -100,7 +101,7 @@ struct UnkStruct_Group u8 state; u8 textState; u8 field_A; - u8 field_B; + u8 listWindowId; u8 field_C; u8 field_D; u8 listTaskId; @@ -113,10 +114,24 @@ struct UnkStruct_Group u8 field_15; }; +struct UnkStruct_URoom +{ + void *field_0; + void *field_4; + void *field_8; + void *field_C; + u16 field_10; + u16 field_12; + u8 field_14; + u8 field_15; + u8 field_16; +}; + union UnkUnion_Main { struct UnkStruct_Leader *leader; struct UnkStruct_Group *group; + struct UnkStruct_URoom *uRoom; }; struct TradeUnkStruct @@ -146,7 +161,7 @@ extern u8 gUnknown_03005DB4; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; IWRAM_DATA struct UnkStruct_Group *gUnknown_03000DA4; -IWRAM_DATA void *gUnknown_03000DA8; +IWRAM_DATA struct UnkStruct_URoom *gUnknown_03000DA8; IWRAM_DATA void *gUnknown_03000DAC; IWRAM_DATA bool32 gUnknown_03000DB0; @@ -158,9 +173,12 @@ void sub_80134E8(u8 taskId); void sub_8013C7C(u8 taskId); void sub_8014A40(u8 taskId); void sub_8014F48(u8 taskId); +void sub_80152F4(u8 taskId); +void sub_80156E0(u8 taskId); void sub_80175EC(struct UnkStruct_Main4 *arg0, u8 count); void sub_8017580(struct UnkStruct_Main0 *arg0, u8 count); u8 sub_8016FC0(struct UnkStruct_Main4 *arg0, u32 arg1); +u8 sub_8016FF0(struct UnkStruct_Main4 *arg0, u32 arg1); bool8 PrintOnTextbox(u8 *textState, const u8 *str); bool8 sub_801320C(struct UnkStruct_Leader *data, u32 arg1, u32 arg2); u8 sub_8013398(struct UnkStruct_Main0 *arg0); @@ -194,6 +212,7 @@ void sub_8018784(u8 windowId); void sub_8018884(const u8 *src); bool32 mevent_0814257C(u8 *textState, const u8 *str); s8 sub_8018B08(u8 *textState, u8 *arg1, u8 arg2, const u8 *str); +bool32 sub_8016F1C(struct UnkStruct_x20 *arg0, s16 arg1); // const rom data extern const u8 *const gUnknown_082EDB60[][5]; @@ -220,6 +239,12 @@ extern const u8 gUnknown_082EDE48[]; extern const u8 gUnknown_082EDE64[]; extern const u8 gUnknown_082EDF40[]; extern const u8 gText_PleaseStartOver[]; +extern const u8 gUnknown_082EF7F8[]; +extern const u8 gUnknown_082EFBC8[]; +extern const u8 gUnknown_082EFC90[]; +extern const u8 gUnknown_082EDEC4[]; +extern const u8 gUnknown_082EDF04[]; +extern const u8 gText_WirelessSearchCanceled[]; extern const u32 gUnknown_082F00C4[]; @@ -240,6 +265,8 @@ extern const u8 *const gUnknown_082EDDC4[]; extern const u8 *const gUnknown_082EFB70[]; extern const u8 *const gUnknown_082EDD50[]; extern const u8 *const gUnknown_082EDE9C[]; +extern const u8 *const gUnknown_082EDF80[]; +extern const u8 *const gUnknown_082EFD58[]; extern const struct UnkStruct_Shared gUnknown_082F045C[]; @@ -936,7 +963,7 @@ void sub_80134E8(u8 taskId) sub_8017580(data->field_0, 16); data->field_11 = sub_8016FC0(data->field_4, gSpecialVar_0x8004); data->field_C = AddWindow(&gUnknown_082F00BC); - data->field_B = AddWindow(&gUnknown_082F0174); + data->listWindowId = AddWindow(&gUnknown_082F0174); data->field_D = AddWindow(&gUnknown_082F017C); FillWindowPixelBuffer(data->field_C, 0x22); @@ -944,9 +971,9 @@ void sub_80134E8(u8 taskId) PutWindowTilemap(data->field_C); CopyWindowToVram(data->field_C, 2); - NewMenuHelpers_DrawStdWindowFrame(data->field_B, FALSE); + NewMenuHelpers_DrawStdWindowFrame(data->listWindowId, FALSE); gMultiuseListMenuTemplate = gUnknown_082F0204; - gMultiuseListMenuTemplate.windowId = data->field_B; + gMultiuseListMenuTemplate.windowId = data->listWindowId; data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); NewMenuHelpers_DrawStdWindowFrame(data->field_D, FALSE); @@ -974,7 +1001,7 @@ void sub_80134E8(u8 taskId) u32 unusedVar; unusedVar = data->field_0->arr[id].unk.field_0.unk_0a_0; - if (data->field_0->arr[id].field_1A_0 == 1 && data->field_0->arr[id].unk.field_0.unk_0a_7 == 0) + if (data->field_0->arr[id].field_1A_0 == 1 && !data->field_0->arr[id].unk.field_0.unk_0a_7) { u32 var = sub_8013B8C(data, id); if (var == 0) @@ -1121,10 +1148,10 @@ void sub_80134E8(u8 taskId) sub_819746C(data->field_D, FALSE); DestroyListMenuTask(data->listTaskId, 0, 0); ClearWindowTilemap(data->field_C); - sub_819746C(data->field_B, FALSE); + sub_819746C(data->listWindowId, FALSE); CopyBgTilemapBufferToVram(0); RemoveWindow(data->field_D); - RemoveWindow(data->field_B); + RemoveWindow(data->listWindowId); RemoveWindow(data->field_C); DestroyTask(data->field_11); Free(data->field_0); @@ -1286,7 +1313,7 @@ u8 sub_8013DBC(struct UnkStruct_Group *data, u32 id) { if (data->field_0->arr[id].field_1A_0 == 1) { - if (data->field_0->arr[id].unk.field_0.unk_0a_7 != 0) + if (data->field_0->arr[id].unk.field_0.unk_0a_7) return 3; else if (data->field_0->arr[id].field_1A_1 != 0) return 1; @@ -1984,3 +2011,393 @@ void sub_8014EFC(u32 arg0) dataPtr->field_12 = arg0 - 21; gSpecialVar_Result = 0; } + +void sub_8014F48(u8 taskId) +{ + s32 id; + struct WindowTemplate winTemplate1, winTemplate2; + struct UnkStruct_Group *data = gUnknown_02022C30.group; + + switch (data->state) + { + case 0: + sub_8010F84(data->field_12 + 21, 0, 0); + sub_800B488(); + OpenLink(); + sub_8011C5C(); + data->field_4 = AllocZeroed(0x70); + data->field_0 = AllocZeroed(0x200); + data->state = 1; + break; + case 1: + sub_8018884(gUnknown_082EF7F8); + data->state = 2; + break; + case 2: + sub_80175EC(data->field_4, 4); + sub_8017580(data->field_0, 16); + data->field_11 = sub_8016FC0(data->field_4, data->field_12 + 7); + + winTemplate1 = gUnknown_082F0174; + winTemplate1.baseBlock = sub_8019930(); + winTemplate1.paletteNum = 0xC; + data->listWindowId = AddWindow(&winTemplate1); + + winTemplate2 = gUnknown_082F017C; + winTemplate2.paletteNum = 0xC; + data->field_D = AddWindow(&winTemplate2); + + sub_8018784(data->listWindowId); + gMultiuseListMenuTemplate = gUnknown_082F0204; + gMultiuseListMenuTemplate.windowId = data->listWindowId; + data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); + + sub_8018784(data->field_D); + FillWindowPixelBuffer(data->field_D, 0x11); + PutWindowTilemap(data->field_D); + sub_80125BC(data->field_D); + CopyWindowToVram(data->field_D, 2); + + CopyBgTilemapBufferToVram(0); + data->field_F = 0; + data->state = 3; + break; + case 3: + id = sub_8013E44(); + switch (id) + { + case 1: + PlaySE(SE_PC_LOGIN); + default: + sub_81AE70C(data->listTaskId); + break; + case 0: + id = ListMenuHandleInputGetItemId(data->listTaskId); + if (gMain.newKeys & A_BUTTON && id != -1) + { + // this unused variable along with the assignment is needed to match + u32 unusedVar; + unusedVar = data->field_0->arr[id].unk.field_0.unk_0a_0; + + if (data->field_0->arr[id].field_1A_0 == 1 && !data->field_0->arr[id].unk.field_0.unk_0a_7) + { + data->field_F = id; + sub_800E0E8(); + CreateWirelessStatusIndicatorSprite(0, 0); + sub_81AE70C(data->listTaskId); + sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]); + sub_8011FC8(data->field_0->arr[data->field_F].unk.playerName, ReadAsU16(data->field_0->arr[data->field_F].unk.field_0.playerTrainerId)); + PlaySE(SE_PN_ON); + data->state = 4; + } + else + { + PlaySE(SE_WALL_HIT); + } + } + else if (gMain.newKeys & B_BUTTON) + { + data->state = 6; + } + break; + } + break; + case 4: + sub_8018884(gUnknown_082EFC3C); + sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]); + data->state = 5; + break; + case 5: + if (gReceivedRemoteLinkPlayers != 0) + { + gUnknown_02022C2C = data->field_0->arr[data->field_F].unk.field_0.unk_0a_0; + data->state = 10; + } + + switch (sub_8011A74()) + { + case 1: + case 2: + case 6: + data->state = 8; + break; + case 5: + sub_8018884(gUnknown_082EDDF4); + sub_8011A64(0, 0); + break; + } + break; + case 6: + case 8: + case 10: + DestroyListMenuTask(data->listTaskId, 0, 0); + CopyBgTilemapBufferToVram(0); + RemoveWindow(data->field_D); + RemoveWindow(data->listWindowId); + DestroyTask(data->field_11); + Free(data->field_0); + Free(data->field_4); + data->state++; + break; + case 9: + if (mevent_0814257C(&data->textState, gUnknown_082EDF80[sub_8011A74()])) + { + sub_800E084(); + DestroyTask(taskId); + sub_800EDD4(); + gSpecialVar_Result = 5; + } + break; + case 7: + sub_800E084(); + sub_8018884(gText_PleaseStartOver); + DestroyTask(taskId); + sub_800EDD4(); + gSpecialVar_Result = 5; + break; + case 11: + data->state++; + sub_800ADF8(); + break; + case 12: + if (sub_800A520()) + DestroyTask(taskId); + break; + } +} + +void sub_80152A8(u32 arg0) +{ + u8 taskId; + struct UnkStruct_Group *dataPtr; + + taskId = CreateTask(sub_80152F4, 0); + gUnknown_02022C30.group = dataPtr = (void*)(gTasks[taskId].data); + gUnknown_03000DA4 = dataPtr; + + dataPtr->state = 0; + dataPtr->textState = 0; + dataPtr->field_12 = arg0 - 21; + gSpecialVar_Result = 0; +} + +void sub_80152F4(u8 taskId) +{ + s32 id; + struct WindowTemplate winTemplate; + struct UnkStruct_Group *data = gUnknown_02022C30.group; + + switch (data->state) + { + case 0: + sub_8010F84(0, 0, 0); + sub_800B488(); + OpenLink(); + sub_8011C5C(); + data->field_4 = AllocZeroed(0x70); + data->field_0 = AllocZeroed(0x200); + data->state = 1; + break; + case 1: + sub_8018884(gUnknown_082EFBC8); + data->state = 2; + break; + case 2: + sub_80175EC(data->field_4, 4); + sub_8017580(data->field_0, 16); + data->field_11 = sub_8016FF0(data->field_4, data->field_12 + 7); + + if (data->field_13 != 0) + { + winTemplate = gUnknown_082F0174; + winTemplate.baseBlock = sub_8019930(); + data->listWindowId = AddWindow(&winTemplate); + + sub_8018784(data->listWindowId); + gMultiuseListMenuTemplate = gUnknown_082F0204; + gMultiuseListMenuTemplate.windowId = data->listWindowId; + data->listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); + + CopyBgTilemapBufferToVram(0); + } + + data->field_F = 0; + data->state = 3; + break; + case 3: + id = sub_8013E44(); + switch (id) + { + case 1: + PlaySE(SE_PC_LOGIN); + default: + if (data->field_13 != 0) + sub_81AE70C(data->listTaskId); + break; + case 0: + if (data->field_13 != 0) + id = ListMenuHandleInputGetItemId(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) + { + if (sub_8016F1C(&data->field_0->arr[0], data->field_12 + 7)) + { + data->field_F = 0; + data->field_14 = 0; + sub_800E0E8(); + CreateWirelessStatusIndicatorSprite(0, 0); + sub_8011FC8(data->field_0->arr[0].unk.playerName, ReadAsU16(data->field_0->arr[0].unk.field_0.playerTrainerId)); + PlaySE(SE_PN_ON); + data->state = 4; + } + else + { + PlaySE(SE_BOO); + data->state = 10; + } + } + } + else if (gMain.newKeys & B_BUTTON) + { + data->state = 6; + data->field_14 = 0; + } + data->field_14++; + break; + } + break; + case 4: + sub_8018884(gUnknown_082EFC90); + sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]); + data->state = 5; + break; + case 5: + if (gReceivedRemoteLinkPlayers != 0) + { + gUnknown_02022C2C = data->field_0->arr[data->field_F].unk.field_0.unk_0a_0; + data->state = 12; + } + + switch (sub_8011A74()) + { + case 1: + case 2: + case 6: + data->state = 8; + break; + case 5: + sub_8018884(gUnknown_082EDEC4); + sub_8011A64(0, 0); + break; + } + break; + case 6: + case 8: + case 10: + case 12: + if (data->field_13 != 0) + { + DestroyListMenuTask(data->listTaskId, 0, 0); + CopyBgTilemapBufferToVram(0); + RemoveWindow(data->listWindowId); + } + DestroyTask(data->field_11); + Free(data->field_0); + Free(data->field_4); + data->state++; + break; + case 9: + if (mevent_0814257C(&data->textState, gUnknown_082EDF04)) + { + sub_800E084(); + DestroyTask(taskId); + sub_800EDD4(); + gSpecialVar_Result = 5; + } + break; + case 7: + if (mevent_0814257C(&data->textState, gText_WirelessSearchCanceled)) + { + sub_800E084(); + DestroyTask(taskId); + sub_800EDD4(); + gSpecialVar_Result = 5; + } + break; + case 11: + if (mevent_0814257C(&data->textState, gUnknown_082EFD58[data->field_12])) + { + sub_800E084(); + DestroyTask(taskId); + sub_800EDD4(); + gSpecialVar_Result = 5; + } + break; + case 13: + data->state++; + sub_800ADF8(); + break; + case 14: + if (sub_800A520()) + DestroyTask(taskId); + break; + } +} + +void UnionRoomSpecial(void) +{ + struct UnkStruct_URoom *dataPtr; + + sub_8010F60(); + CreateTask(sub_80156E0, 10); + + // dumb line needed to match + gUnknown_02022C30.uRoom = gUnknown_02022C30.uRoom; + + dataPtr = AllocZeroed(0x26C); + gUnknown_02022C30.uRoom = dataPtr; + gUnknown_03000DA8 = dataPtr; + + dataPtr->field_14 = 0; + dataPtr->field_16 = 0; + dataPtr->field_10 = 0; + dataPtr->field_12 = 0; + + gSpecialVar_Result = 0; + sub_819A2BC(0xD0, 1); +} + +u16 ReadAsU16(const u8 *ptr) +{ + return (ptr[1] << 8) | (ptr[0]); +} + +void sub_8015664(u32 arg0, const u8 *src) +{ + struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; + + data->field_14 = 8; + data->field_15 = arg0; + if (src != gStringVar4) + StringExpandPlaceholders(gStringVar4, src); +} + +void sub_801568C(const u8 *src) +{ + struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; + + data->field_14 = 26; + if (src != gStringVar4) + StringExpandPlaceholders(gStringVar4, src); +} + +void sub_80156B0(struct UnkStruct_URoom *data) +{ + memcpy(&gDecompressionBuffer[0x3F00], data->field_0, 0x100); +} + +void sub_80156C8(struct UnkStruct_URoom *data) +{ + memcpy(data->field_0, &gDecompressionBuffer[0x3F00], 0x100); +} -- cgit v1.2.3 From 166295acc78b0057e25f6e46f9fa183369708053 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 9 Jun 2018 22:14:52 +0200 Subject: union room prepare for battle --- include/field_screen.h | 1 + include/librfu.h | 4 +- include/link_rfu.h | 10 + include/party_menu.h | 2 + src/rom_8011DC0.c | 800 ++++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 801 insertions(+), 16 deletions(-) diff --git a/include/field_screen.h b/include/field_screen.h index d9a2bb5fa..268b9312e 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -14,5 +14,6 @@ void UpdateWeatherPerDay(u16 days); void sub_80AC3D0(void); void sub_80AC3E4(void); void PreservePaletteInWeather(u8); +void sub_80AF128(void); #endif //GUARD_FIELD_SCREEN_H diff --git a/include/librfu.h b/include/librfu.h index 2c4d091bd..03c142587 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -80,8 +80,8 @@ struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 u16 unk_01_6:2; u8 playerTrainerId[2]; u8 unk_04[4]; - u16 unk_08_0:10; - u16 unk_09_2:6; + u16 species:10; + u16 type:6; u8 unk_0a_0:7; u8 unk_0a_7:1; u8 playerGender:1; diff --git a/include/link_rfu.h b/include/link_rfu.h index 7a3254632..52006be44 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -254,5 +254,15 @@ void sub_800ED28(void); void sub_8011090(u8 a0, u32 a1, u32 a2); void sub_8011FC8(u8 *a0, u16 a1); void sub_8010FA0(bool32 a0, bool32 a1); +void sub_8010F60(void); +void sub_8010FCC(u32 a0, u32 a1, u32 a2); +void sub_8011C84(void); +void sub_8012188(const u8 *a0, struct UnkLinkRfuStruct_02022B14 *arg1, u8 arg2); +bool32 sub_8011B90(void); +void sub_800FE50(u16 *a0); +bool32 sub_800E540(u16 id, u8 *name); +void sub_8011DE0(u32 arg0); +u8 sub_801100C(int a0); +void sub_800FE50(u16 *a0); #endif //GUARD_LINK_RFU_H diff --git a/include/party_menu.h b/include/party_menu.h index b67633c2b..39492302f 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -39,5 +39,7 @@ void sub_81B1B5C(void *a, u8 b); u8 sub_81B1BD4(); void sub_81B8448(); void sub_81B8518(u8 unused); +u8 sub_81B1360(void); +void sub_81B8904(u8 arg0, void (*callback)(void)); #endif // GUARD_PARTY_MENU_H diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index d3902f208..2f1c413b9 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -16,6 +16,8 @@ #include "constants/songs.h" #include "constants/game_stat.h" #include "constants/maps.h" +#include "constants/species.h" +#include "constants/rgb.h" #include "trade.h" #include "trainer_card.h" #include "overworld.h" @@ -27,6 +29,9 @@ #include "field_weather.h" #include "palette.h" #include "decompress.h" +#include "start_menu.h" +#include "data2.h" +#include "field_screen.h" extern void HealPlayerParty(void); @@ -116,15 +121,31 @@ struct UnkStruct_Group struct UnkStruct_URoom { - void *field_0; - void *field_4; - void *field_8; - void *field_C; + struct UnkStruct_Main0 *field_0; + struct UnkStruct_Main4 *field_4; + struct UnkStruct_Main0 *field_8; + struct UnkStruct_Main4 *field_C; u16 field_10; u16 field_12; - u8 field_14; + u8 state; u8 field_15; - u8 field_16; + u8 textState; + u8 field_17; + u8 field_18; + u8 field_19; + u8 field_1A; + u8 field_1B; + u8 field_1C; + u8 field_1D; + u8 field_1E; + u8 field_1F; + u8 field_20; + u8 spriteIds[40]; + u8 field_4A; + u16 field_4C[6]; + u8 field_58[0x98 - 0x58]; + u16 field_98; + u16 field_9A; }; union UnkUnion_Main @@ -139,13 +160,14 @@ struct TradeUnkStruct u16 field_0; u16 field_2; u32 field_4; - u32 field_8; + u8 field_8; + u8 field_9; u16 field_A; u16 field_C; - u16 field_E; - u16 field_10; + u16 species; + u16 level; u16 field_12; - u32 field_14; + u32 personality; }; extern struct TradeUnkStruct gUnknown_02022C40; @@ -213,6 +235,38 @@ void sub_8018884(const u8 *src); bool32 mevent_0814257C(u8 *textState, const u8 *str); s8 sub_8018B08(u8 *textState, u8 *arg1, u8 arg2, const u8 *str); bool32 sub_8016F1C(struct UnkStruct_x20 *arg0, s16 arg1); +u8 sub_8016DF0(struct UnkStruct_Main4 *arg0, struct UnkStruct_Main4 *arg1, u32 arg2); +void sub_8019F2C(void); +s16 sub_8019E70(u8 *arg0, s32 arg1); +bool32 sub_80180A0(u8 monId, struct TradeUnkStruct *arg1); +void sub_80180E8(u8 monId, struct TradeUnkStruct *arg1); +bool32 sub_801A2A8(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3); +void sub_80181CC(void); +bool32 sub_8017940(void); +u8 sub_8016B00(void); +void sub_801A274(struct UnkStruct_URoom *arg0); +void sub_801A284(struct UnkStruct_URoom *arg0); +void sub_8017FD8(struct UnkStruct_URoom *arg0); +void sub_801689C(struct UnkStruct_URoom *arg0); +u8 sub_80181DC(struct UnkStruct_URoom *arg0); +bool32 sub_80168DC(struct UnkStruct_URoom *arg0); +bool32 sub_801704C(void); +u32 sub_8017CF8(u32 arg1, struct UnkStruct_Main0 *arg0); +u32 sub_80179D4(struct UnkStruct_Main0 *arg0, u8 arg1, u8 arg2, u32 arg3); +void sub_801818C(bool32 arg0); +void sub_801A3D0(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2); +s32 sub_8017178(u8 *arg0, u8 *arg1, u8 *arg2, const struct WindowTemplate *winTemplate, const struct ListMenuTemplate *menuTemplate); +s32 sub_80172A0(u8 *arg0, u8 *arg1, u8 *arg2, u8 *arg3, const struct WindowTemplate *winTemplate, const struct ListMenuTemplate *menuTemplate, struct UnkStruct_Main0 *arg6); +bool32 sub_8018024(void); +u32 sub_8017984(u32 arg0); +void sub_8018220(u8 *unused, struct UnkStruct_URoom *arg1, bool8 arg2); +void sub_8017D9C(u8 *dst, u32 arg1, u32 playerGender); +s32 sub_80179AC(struct UnkStruct_x20 *arg0); +void sub_8017E00(u8 *dst, u8 arg1); +void sub_8019F04(u8 *spriteIds); +void sub_8019E3C(void); +void sub_80173B0(void); +s32 sub_8017D04(u32 type, u32 species); // const rom data extern const u8 *const gUnknown_082EDB60[][5]; @@ -245,6 +299,24 @@ extern const u8 gUnknown_082EFC90[]; extern const u8 gUnknown_082EDEC4[]; extern const u8 gUnknown_082EDF04[]; extern const u8 gText_WirelessSearchCanceled[]; +extern const u8 gUnknown_082EF4FC[]; +extern const u8 gUnknown_082EF520[]; +extern const u8 gUnknown_082EF5B8[]; +extern const u8 gUnknown_082EF1EC[]; +extern const u8 gUnknown_082EF544[]; +extern const u8 gUnknown_082EF47C[]; +extern const u8 gUnknown_082EE6C8[]; +extern const u8 gUnknown_082EE004[]; +extern const u8 gUnknown_082EEBD0[]; +extern const u8 gUnknown_082EEB88[]; +extern const u8 gUnknown_082EE598[]; +extern const u8 gUnknown_082EEC14[]; +extern const u8 gUnknown_082EF590[]; +extern const u8 gUnknown_082EF20C[]; +extern const u8 gUnknown_082EF564[]; +extern const u8 gUnknown_082EF4C4[]; +extern const u8 gUnknown_082EF298[]; +extern const u8 gUnknown_082EF65C[]; extern const u32 gUnknown_082F00C4[]; @@ -256,9 +328,17 @@ extern const struct WindowTemplate gUnknown_082F012C; extern const struct WindowTemplate gUnknown_082F011C; extern const struct WindowTemplate gUnknown_082F0174; extern const struct WindowTemplate gUnknown_082F017C; +extern const struct WindowTemplate gUnknown_082F021C; +extern const struct WindowTemplate gUnknown_082F025C; +extern const struct WindowTemplate gUnknown_082F0294; +extern const struct WindowTemplate gUnknown_082F034C; extern const struct ListMenuTemplate gUnknown_082F015C; extern const struct ListMenuTemplate gUnknown_082F0204; +extern const struct ListMenuTemplate gUnknown_082F0244; +extern const struct ListMenuTemplate gUnknown_082F027C; +extern const struct ListMenuTemplate gUnknown_082F032C; +extern const struct ListMenuTemplate gUnknown_082F03A4; extern const u8 *const gUnknown_082F0048[]; extern const u8 *const gUnknown_082EDDC4[]; @@ -267,6 +347,14 @@ extern const u8 *const gUnknown_082EDD50[]; extern const u8 *const gUnknown_082EDE9C[]; extern const u8 *const gUnknown_082EDF80[]; extern const u8 *const gUnknown_082EFD58[]; +extern const u8 *const gUnknown_082EEB80[]; +extern const u8 *const gUnknown_082EE378[]; +extern const u8 *const gUnknown_082EEC9C[]; +extern const u8 *const gUnknown_082EED3C[]; +extern const u8 *const gUnknown_082EE324[]; + +extern const u8 *const gUnknown_082EE82C[][2]; +extern const u8 *const gUnknown_082EE24C[][2]; extern const struct UnkStruct_Shared gUnknown_082F045C[]; @@ -2359,8 +2447,8 @@ void UnionRoomSpecial(void) gUnknown_02022C30.uRoom = dataPtr; gUnknown_03000DA8 = dataPtr; - dataPtr->field_14 = 0; - dataPtr->field_16 = 0; + dataPtr->state = 0; + dataPtr->textState = 0; dataPtr->field_10 = 0; dataPtr->field_12 = 0; @@ -2377,7 +2465,7 @@ void sub_8015664(u32 arg0, const u8 *src) { struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; - data->field_14 = 8; + data->state = 8; data->field_15 = arg0; if (src != gStringVar4) StringExpandPlaceholders(gStringVar4, src); @@ -2387,7 +2475,7 @@ void sub_801568C(const u8 *src) { struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; - data->field_14 = 26; + data->state = 26; if (src != gStringVar4) StringExpandPlaceholders(gStringVar4, src); } @@ -2401,3 +2489,687 @@ void sub_80156C8(struct UnkStruct_URoom *data) { memcpy(data->field_0, &gDecompressionBuffer[0x3F00], 0x100); } + +void sub_80156E0(u8 taskId) +{ + u32 var; + s32 var5; + u8 monId = 0; + struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; + s16 *taskData = gTasks[taskId].data; + + switch (data->state) + { + case 0: + data->field_4 = AllocZeroed(0x70); + data->field_C = AllocZeroed(0x70); + data->field_0 = AllocZeroed(0x100); + data->field_8 = AllocZeroed(0x20); + sub_8017580(data->field_0, 8); + gUnknown_02022C2C = 0x40; + data->field_20 = sub_8016DF0(data->field_C, data->field_4, 9); + sub_8019F2C(); + data->state = 1; + break; + case 1: + if (sub_8019E70(data->spriteIds, taskData[0]++) == 8) + data->state = 2; + break; + case 2: + sub_8010F84(0x40, 0, 0); + sub_8010FCC(gUnknown_02022C40.field_2, gUnknown_02022C40.field_A, gUnknown_02022C40.field_C); + sub_800B488(); + OpenLink(); + sub_8011C84(); + sub_8017580(data->field_8, 1); + sub_80175EC(data->field_4, 4); + sub_80175EC(data->field_C, 4); + gSpecialVar_Result = 0; + data->state = 3; + break; + case 3: + if ((sub_81B1360() == 8 || sub_81B1360() == 9) && gUnknown_02022C40.field_0 != 0) + { + monId = GetCursorSelectionMonId(); + switch (gUnknown_02022C40.field_0) + { + case 1: + sub_8011090(0x54, 0, 1); + if (monId >= PARTY_SIZE) + { + sub_801807C(&gUnknown_02022C40); + sub_8010FCC(0, 0, 0); + sub_801568C(gUnknown_082EF4FC); + } + else if (sub_80180A0(GetCursorSelectionMonId(), &gUnknown_02022C40)) + { + sub_8015664(0x34, gUnknown_082EF47C); + } + else + { + data->state = 55; + } + break; + case 2: + sub_80156C8(data); + taskData[1] = gUnknown_02022C40.field_8; + if (monId >= PARTY_SIZE) + { + sub_801568C(gUnknown_082EF544); + } + else + { + sub_8011090(0x54, 0, 1); + gUnknown_02022C2C = 0x44; + sub_80180E8(GetCursorSelectionMonId(), &gUnknown_02022C40); + data->state = 51; + } + break; + } + gUnknown_02022C40.field_0 = 0; + } + else + { + data->state = 4; + } + break; + case 4: + if (gSpecialVar_Result != 0) + { + if (gSpecialVar_Result == 9) + { + sub_8011090(0x54, 0, 1); + PlaySE(SE_PC_LOGIN); + StringCopy(gStringVar1, gSaveBlock2Ptr->playerName); + data->state = 42; + gSpecialVar_Result = 0; + } + else if (gSpecialVar_Result == 11) + { + sub_8011090(0x54, 0, 1); + data->state = 23; + gSpecialVar_Result = 0; + } + else + { + taskData[0] = 0; + taskData[1] = gSpecialVar_Result - 1; + data->state = 24; + gSpecialVar_Result = 0; + } + } + else if (ScriptContext2_IsEnabled() == TRUE) + { + if (gMain.heldKeys & A_BUTTON) + { + if (sub_801A2A8(data->field_0, &taskData[0], &taskData[1], data->spriteIds)) + { + PlaySE(SE_SELECT); + sub_80181CC(); + data->state = 24; + break; + } + else if (sub_8017940()) + { + sub_8011090(0x54, 0, 1); + PlaySE(SE_PC_LOGIN); + sub_80181CC(); + StringCopy(gStringVar1, gSaveBlock2Ptr->playerName); + data->state = 45; + break; + } + } + + switch (sub_8016B00()) + { + case 1: + PlaySE(SE_PC_LOGIN); + case 2: + sub_801A274(data); + break; + case 4: + data->state = 11; + sub_80181CC(); + sub_8010FCC(0, 0, 0); + sub_8011090(0x53, sub_80181DC(data), 0); + break; + } + sub_801A284(data); + } + break; + case 23: + if (!FuncIsActiveTask(sub_809FA34)) + { + sub_8011090(0x40, 0, 0); + data->state = 4; + } + break; + case 24: + sub_801704C(); + var = sub_8017CF8(taskData[1], data->field_0); + sub_8011090(0x54, 0, 1); + switch (sub_80179D4(data->field_0, taskData[0], taskData[1], var)) + { + case 0: + data->state = 26; + break; + case 1: + sub_8012188(data->field_0->arr[taskData[0]].unk.playerName, &data->field_0->arr[taskData[0]].unk.field_0, gUnknown_02022C2C); + data->field_12 = 0; + data->state = 25; + break; + case 2: + sub_8015664(0x13, gStringVar4); + break; + } + break; + case 25: + sub_801704C(); + var = sub_8011A74(); + switch (var) + { + case 4: + sub_801818C(TRUE); + data->state = 4; + break; + case 1: + case 2: + if (sub_8011B90() == TRUE) + sub_801568C(gUnknown_082EE6C8); + else + sub_8015664(30, gUnknown_082EE6C8); + + gUnknown_02022C2C = 0x40; + break; + } + + if (gReceivedRemoteLinkPlayers == 0) + { + sub_80143E4(gBlockSendBuffer, TRUE); + CreateTask(sub_80140E0, 5); + data->state = 38; + } + break; + case 38: + if (FuncIsActiveTask(sub_80140E0)) + { + if (gUnknown_02022C2C == 0x44) + sub_8015664(31, gUnknown_082EE004); + else + data->state = 5; + } + break; + case 30: + if (gReceivedRemoteLinkPlayers == 0) + { + sub_801818C(FALSE); + sub_801A3D0(taskData[0], taskData[1], data->field_0); + data->state = 2; + } + break; + case 6: + var5 = sub_8017178(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_082F021C, &gUnknown_082F0244); + if (var5 != -1) + { + if (gReceivedRemoteLinkPlayers == 0) + { + data->state = 28; + } + else + { + data->field_98 = 0; + sub_8017CF8(taskData[1], data->field_0); + if (var5 == -2 || var5 == 0x40) + { + data->field_4C[0] = 0x40; + sub_800FE50(data->field_4C); + StringCopy(gStringVar4, gUnknown_082EEB80[gLinkPlayers[0].gender]); + data->state = 32; + } + else + { + gUnknown_02022C2C = var5; + gUnknown_02022C2D = var5 >> 8; + if (gUnknown_02022C2C == 0x41 && !sub_8018024()) + { + sub_8015664(5, gUnknown_082EEBD0); + } + else + { + gUnknown_02022C2C |= 0x40; + data->field_4C[0] = gUnknown_02022C2C; + data->state = 27; + } + } + } + } + break; + case 28: + StringCopy(gStringVar4, gUnknown_082EEB88); + data->state = 36; + break; + case 27: + sub_8017FD8(data); + var = sub_8017CF8(taskData[1], data->field_0); + var5 = sub_8017984(data->field_4C[0] & 0x3F); + if (PrintOnTextbox(&data->textState, gUnknown_082EE82C[var5][var])) + { + taskData[3] = 0; + data->state = 29; + } + break; + case 32: + sub_800AC34(); + data->state = 36; + break; + case 31: + data->field_4C[0] = 0x44; + data->field_4C[1] = gUnknown_02022C40.level; + sub_800FE50(data->field_4C); + data->state = 29; + break; + case 29: + if (gReceivedRemoteLinkPlayers == 0) + { + StringCopy(gStringVar4, gUnknown_082EEB88); + data->state = 28; + } + else + { + sub_8017FD8(data); + if (data->field_98 == 0x51) + { + if (gUnknown_02022C2C == 8) + { + sub_8018220(gStringVar4, data, FALSE); + data->state = 40; + } + else + { + data->state = 13; + } + } + else if (data->field_98 == 0x52) + { + data->state = 32; + sub_8017D9C(gStringVar4, gUnknown_02022C2C | 0x40, gLinkPlayers[0].gender); + gUnknown_02022C2C = 0; + } + } + break; + case 5: + case 7: + var5 = sub_80179AC(&data->field_0->arr[taskData[1]]); + var = sub_8017CF8(taskData[1], data->field_0); + sub_8015664(6, gUnknown_082EE24C[var][var5]); + break; + case 40: + if (PrintOnTextbox(&data->textState, gStringVar4)) + { + data->state = 41; + sub_800ADF8(); + data->field_98 = 0; + data->field_9A = 0; + } + break; + case 41: + if (sub_800A520()) + { + if (GetMultiplayerId() == 0) + { + StringCopy(gStringVar1, gLinkPlayers[GetMultiplayerId() ^ 1].name); + var5 = sub_800E540(gLinkPlayers[2].id, gLinkPlayers[2].name); + StringExpandPlaceholders(gStringVar4, gUnknown_082EE378[var5]); + data->state = 33; + } + else + { + data->state = 7; + } + } + break; + case 19: + var5 = sub_80170B8(&data->textState, FALSE); + switch (var5) + { + case 0: + CopyBgTilemapBufferToVram(0); + gUnknown_02022C2C = 0x45; + sub_8011090(0x45, 0, 1); + sub_8012188(data->field_0->arr[taskData[1]].unk.playerName, &data->field_0->arr[taskData[1]].unk.field_0, gUnknown_02022C2C); + data->field_12 = taskData[1]; + data->state = 20; + taskData[3] = 0; + break; + case 1: + case -1: + var = sub_8017CF8(taskData[1], data->field_0); + sub_801568C(gUnknown_082EEC9C[var]); + break; + } + break; + case 20: + if (++taskData[2] >= 60) + { + data->state = 21; + taskData[2] = 0; + } + break; + case 21: + var = sub_8011A74(); + switch (var) + { + case 4: + sub_801818C(TRUE); + data->state = 4; + break; + case 1: + case 2: + var = sub_8017CF8(taskData[1], data->field_0); + sub_8011090(0x54, 0, 1); + if (sub_8011B90() == TRUE) + sub_801568C(gUnknown_082EED3C[var]); + else + sub_8015664(30, gUnknown_082EED3C[var]); + break; + case 3: + data->state = 22; + break; + } + taskData[3]++; + break; + case 22: + if (sub_8011A80()) + { + var = sub_8017CF8(taskData[1], data->field_0); + sub_8011090(0x54, 0, 1); + if (sub_8011B90() == TRUE) + sub_801568C(gUnknown_082EED3C[var]); + else + sub_8015664(30, gUnknown_082EED3C[var]); + } + if (gReceivedRemoteLinkPlayers == 0) + data->state = 16; + break; + case 11: + PlaySE(SE_PINPON); + data->state = 12; + data->field_9A = 0; + break; + case 12: + if (sub_8011A80()) + { + sub_801818C(FALSE); + data->state = 2; + } + else if (gReceivedRemoteLinkPlayers == 0) + { + sub_80143E4(gBlockSendBuffer, TRUE); + CreateTask(sub_80140E0, 5); + data->state = 39; + } + break; + case 39: + sub_801689C(data); + if (!FuncIsActiveTask(sub_80140E0)) + { + data->state = 33; + StringCopy(gStringVar1, gLinkPlayers[1].name); + var5 = sub_800E540(gLinkPlayers[1].id, gLinkPlayers[1].name); + StringExpandPlaceholders(gStringVar4, gUnknown_082EE324[var5]); + } + break; + case 33: + sub_801689C(data); + if (PrintOnTextbox(&data->textState, gStringVar4)) + data->state = 34; + break; + case 34: + sub_801689C(data); + if (sub_80168DC(data) && gMain.heldKeys & B_BUTTON) + { + sub_8011DE0(1); + StringCopy(gStringVar4, gUnknown_082EE598); + data->state = 36; + } + break; + case 35: + sub_8015664(9, gStringVar4); + break; + case 9: + switch (sub_80170B8(&data->textState, FALSE)) + { + case 0: + data->field_4C[0] = 0x51; + if (gUnknown_02022C2C == 0x45) + sub_8011090(gUnknown_02022C2C | 0x40, sub_801100C(1), 0); + else + sub_8011090(gUnknown_02022C2C | 0x40, sub_801100C(1), 1); + + data->field_8->arr[0].field_1B = 0; + taskData[3] = 0; + if (gUnknown_02022C2C == 0x41) + { + if (sub_8018024()) + { + data->field_4C[0] = 0x52; + sub_800FE50(data->field_4C); + data->state = 10; + StringCopy(gStringVar4, gUnknown_082EEC14); + } + else + { + sub_800FE50(data->field_4C); + data->state = 13; + } + } + else if (gUnknown_02022C2C == 0x48) + { + sub_8018220(gStringVar4, data, 1); + data->state = 40; + } + else + { + sub_800FE50(data->field_4C); + data->state = 13; + } + break; + case 1: + case -1: + data->field_4C[0] = 0x52; + sub_800FE50(data->field_4C); + data->state = 10; + sub_8013078(gStringVar4, gUnknown_02022C2C); + break; + } + break; + case 10: + sub_800AC34(); + data->state = 36; + break; + case 36: + if (gReceivedRemoteLinkPlayers == 0) + { + gUnknown_02022C2C = 0x40; + sub_8015664(0x25, gStringVar4); + memset(data->field_4C, 0, sizeof(data->field_4C)); + data->field_9A = 0; + data->field_98 = 0; + } + break; + case 37: + data->state = 2; + sub_801818C(FALSE); + break; + case 13: + sub_8017E00(gStringVar4, gUnknown_02022C2C | 0x40); + sub_8015664(0xE, gStringVar4); + break; + case 14: + sub_800ADF8(); + data->state = 15; + break; + case 15: + if (sub_800A520()) + data->state = 16; + break; + case 16: + Free(data->field_8); + Free(data->field_0); + Free(data->field_C); + Free(data->field_4); + DestroyTask(data->field_20); + sub_8019F04(data->spriteIds); + data->state = 17; + break; + case 17: + BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); + data->state = 18; + break; + case 18: + if (!UpdatePaletteFade()) + { + sub_8019E3C(); + DestroyTask(taskId); + Free(gUnknown_02022C30.uRoom); + sub_80149D8(); + } + break; + case 42: + if (sub_800F7DC()->species == SPECIES_NONE) + { + data->state = 43; + } + else + { + if (sub_800F7DC()->species == SPECIES_EGG) + { + StringCopy(gStringVar4, gUnknown_082EF590); + } + else + { + StringCopy(gStringVar1, gSpeciesNames[sub_800F7DC()->species]); + ConvertIntToDecimalStringN(gStringVar2, sub_800F7DC()->unk_0b_1, STR_CONV_MODE_LEFT_ALIGN, 3); + StringExpandPlaceholders(gStringVar4, gUnknown_082EF564); + } + sub_8015664(44, gStringVar4); + } + break; + case 43: + if (PrintOnTextbox(&data->textState, gUnknown_082EF20C)) + data->state = 47; + break; + case 47: + var5 = sub_8017178(&data->textState, &data->field_1D, &data->field_1E, &gUnknown_082F025C, &gUnknown_082F027C); + if (var5 != -1) + { + switch (var5) + { + case -2: + case 3: + data->state = 4; + sub_801818C(TRUE); + break; + case 1: + sub_8015664(53, gUnknown_082EF4C4); + break; + case 2: + sub_8015664(47, gUnknown_082EF298); + break; + } + } + break; + case 53: + BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + data->state = 54; + break; + case 54: + if (!gPaletteFade.active) + { + gUnknown_02022C40.field_0 = 1; + gFieldCallback = sub_80AF128; + sub_81B8904(8, CB2_ReturnToField); + } + break; + case 52: + var5 = sub_8017178(&data->textState, &data->field_1D, &data->field_1E, &gUnknown_082F0294, &gUnknown_082F032C); + if (var5 != -1) + { + switch (var5) + { + case -2: + case 18: + sub_801807C(&gUnknown_02022C40); + sub_8010FCC(0, 0, 0); + sub_801568C(gUnknown_082EF4FC); + break; + default: + gUnknown_02022C40.field_2 = var5; + data->state = 55; + break; + } + } + break; + case 55: + sub_8010FCC(gUnknown_02022C40.field_2, gUnknown_02022C40.field_A, gUnknown_02022C40.field_C); + sub_801568C(gUnknown_082EF520); + break; + case 44: + switch (sub_80170B8(&data->textState, FALSE)) + { + case 0: + data->state = 56; + break; + case 1: + case -1: + sub_801818C(TRUE); + data->state = 4; + break; + } + break; + case 56: + if (PrintOnTextbox(&data->textState, gUnknown_082EF5B8)) + { + sub_8010FCC(0, 0, 0); + sub_801807C(&gUnknown_02022C40); + sub_801818C(TRUE); + data->state = 4; + } + break; + case 45: + if (PrintOnTextbox(&data->textState, gUnknown_082EF1EC)) + data->state = 46; + break; + case 46: + sub_80173B0(); + data->state = 48; + break; + case 48: + var5 = sub_80172A0(&data->textState, &data->field_1D, &data->field_4A, &data->field_1E, &gUnknown_082F0294, &gUnknown_082F032C, data->field_0); + if (var5 != -1) + { + switch (var5) + { + case -2: + case 8: + sub_801818C(TRUE); + data->state = 4; + break; + default: + sub_80173B0(); + switch (sub_8017D04(data->field_0->arr[var5].unk.field_0.type, data->field_0->arr[var5].unk.field_0.species)) + { + case 0: + sub_8018404(gStringVar1, &data->field_0->arr[var5]); + sub_8015664(49, gUnknown_082EF65C); + taskData[1] = var5; + break; + case 1: + break; + } + break; + } + } + break; + } +} -- cgit v1.2.3 From 5526d980ec656c7a9a66937376c2dc9cdf9c7a54 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 10 Jun 2018 18:28:37 +0200 Subject: union room is too hard --- asm/rom_8011DC0.s | 1851 ---------------------------------------------------- include/librfu.h | 9 +- include/link_rfu.h | 2 +- src/link_rfu.c | 34 +- src/rom_8011DC0.c | 262 +++++--- 5 files changed, 198 insertions(+), 1960 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index b450d811d..4bfd02b18 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -5,1858 +5,7 @@ .text - - thumb_func_start sub_80156E0 -sub_80156E0: @ 80156E0 - push {r4-r7,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r4, r0, 24 - movs r5, 0 - ldr r0, =gUnknown_02022C30 - ldr r6, [r0] - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r7, r0, r1 - ldrb r0, [r6, 0x14] - cmp r0, 0x38 - bls _08015702 - bl _08016878 -_08015702: - lsls r0, 2 - ldr r1, =_08015718 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08015718: - .4byte _080157FC - .4byte _08015854 - .4byte _08015878 - .4byte _080158C8 - .4byte _080159A6 - .4byte _08015E5C - .4byte _08015C54 - .4byte _08015E5C - .4byte _08016864 - .4byte _080161C8 - .4byte _080162D4 - .4byte _080160AC - .4byte _080160C6 - .4byte _08016324 - .4byte _08016348 - .4byte _08016350 - .4byte _08016360 - .4byte _0801638E - .4byte _080163A2 - .4byte _08015F32 - .4byte _08015FB8 - .4byte _08015FD6 - .4byte _0801604A - .4byte _08015ADA - .4byte _08015B00 - .4byte _08015B78 - .4byte _08016838 - .4byte _08015D4C - .4byte _08015D34 - .4byte _08015DD0 - .4byte _08015C2A - .4byte _08015DA6 - .4byte _08015D9C - .4byte _08016158 - .4byte _08016178 - .4byte _080161B8 - .4byte _080162DC - .4byte _08016318 - .4byte _08015BF4 - .4byte _08016104 - .4byte _08015E94 - .4byte _08015EC4 - .4byte _080163CC - .4byte _0801645C - .4byte _080165A8 - .4byte _08016610 - .4byte _0801662C - .4byte _08016478 - .4byte _08016634 - .4byte _08016738 - .4byte _0801676C - .4byte _080167F4 - .4byte _0801652C - .4byte _080164E0 - .4byte _080164F4 - .4byte _0801658C - .4byte _080165DC -_080157FC: - movs r0, 0x70 - bl AllocZeroed - str r0, [r6, 0x4] - movs r0, 0x70 - bl AllocZeroed - str r0, [r6, 0xC] - movs r0, 0x80 - lsls r0, 1 - bl AllocZeroed - str r0, [r6] - movs r0, 0x20 - bl AllocZeroed - str r0, [r6, 0x8] - ldr r0, [r6] - movs r1, 0x8 - bl sub_8017580 - ldr r1, =gUnknown_02022C2C - movs r0, 0x40 - strb r0, [r1] - ldr r0, [r6, 0xC] - ldr r1, [r6, 0x4] - movs r2, 0x9 - bl sub_8016DF0 - adds r1, r6, 0 - adds r1, 0x20 - strb r0, [r1] - adds r0, r6, 0 - adds r0, 0xA0 - bl sub_8019BA8 - bl sub_8019F2C - movs r0, 0x1 - bl _08016876 - .pool -_08015854: - adds r0, r6, 0 - adds r0, 0x21 - movs r2, 0 - ldrsh r1, [r7, r2] - bl sub_8019E70 - ldrh r0, [r7] - adds r0, 0x1 - strh r0, [r7] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - beq _08015872 - bl _08016878 -_08015872: - movs r0, 0x2 - bl _08016876 -_08015878: - movs r0, 0x40 - movs r1, 0 - movs r2, 0 - bl sub_8010F84 - ldr r2, =gUnknown_02022C40 - ldrh r0, [r2, 0x2] - ldrh r1, [r2, 0xA] - ldrh r2, [r2, 0xC] - bl sub_8010FCC - bl sub_800B488 - bl OpenLink - bl sub_8011C84 - ldr r0, [r6, 0x8] - movs r1, 0x1 - bl sub_8017580 - ldr r0, [r6, 0x4] - movs r1, 0x4 - bl sub_80175EC - ldr r0, [r6, 0xC] - movs r1, 0x4 - bl sub_80175EC - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] - movs r0, 0x3 - bl _08016876 - .pool -_080158C8: - bl sub_81B1360 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x8 - beq _080158E0 - bl sub_81B1360 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x9 - bne _080159A0 -_080158E0: - ldr r4, =gUnknown_02022C40 - ldrh r0, [r4] - cmp r0, 0 - beq _080159A0 - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r5, r0, 24 - ldrh r0, [r4] - cmp r0, 0x1 - beq _08015900 - cmp r0, 0x2 - beq _08015950 - b _0801598E - .pool -_08015900: - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - cmp r5, 0x5 - bls _0801592C - adds r0, r4, 0 - bl sub_801807C - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010FCC - ldr r0, =gUnknown_082EF4FC - bl sub_801568C - b _0801598E - .pool -_0801592C: - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - adds r1, r4, 0 - bl sub_80180A0 - cmp r0, 0 - bne _0801594C - ldr r1, =gUnknown_082EF47C - movs r0, 0x34 - bl sub_8015664 - b _0801598E - .pool -_0801594C: - movs r0, 0x37 - b _0801598C -_08015950: - adds r0, r6, 0 - bl sub_80156C8 - ldrb r0, [r4, 0x8] - strh r0, [r7, 0x2] - cmp r5, 0x5 - bls _0801596C - ldr r0, =gUnknown_082EF544 - bl sub_801568C - b _0801598E - .pool -_0801596C: - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - ldr r1, =gUnknown_02022C2C - movs r0, 0x44 - strb r0, [r1] - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - adds r1, r4, 0 - bl sub_80180E8 - movs r0, 0x33 -_0801598C: - strb r0, [r6, 0x14] -_0801598E: - ldr r1, =gUnknown_02022C40 - movs r0, 0 - strh r0, [r1] - bl _08016878 - .pool -_080159A0: - movs r0, 0x4 - bl _08016876 -_080159A6: - ldr r4, =gSpecialVar_Result - ldrh r0, [r4] - cmp r0, 0 - beq _08015A0A - cmp r0, 0x9 - bne _080159E0 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - movs r0, 0x2 - bl PlaySE - ldr r0, =gStringVar1 - ldr r1, =gSaveBlock2Ptr - ldr r1, [r1] - bl StringCopy - movs r1, 0 - movs r0, 0x2A - b _08015A02 - .pool -_080159E0: - cmp r0, 0xB - bne _080159F4 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - movs r1, 0 - movs r0, 0x17 - b _08015A02 -_080159F4: - movs r0, 0 - strh r0, [r7] - ldrh r0, [r4] - subs r0, 0x1 - strh r0, [r7, 0x2] - movs r1, 0 - movs r0, 0x18 -_08015A02: - strb r0, [r6, 0x14] - strh r1, [r4] - bl _08016878 -_08015A0A: - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08015A1A - bl _08016878 -_08015A1A: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08015A80 - ldr r0, [r6] - adds r2, r7, 0x2 - adds r3, r6, 0 - adds r3, 0x21 - adds r1, r7, 0 - bl sub_801A2A8 - cmp r0, 0 - beq _08015A4C - movs r0, 0x5 - bl PlaySE - bl sub_80181CC - movs r0, 0x18 - bl _08016876 - .pool -_08015A4C: - bl sub_8017940 - cmp r0, 0 - beq _08015A80 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - movs r0, 0x2 - bl PlaySE - bl sub_80181CC - ldr r0, =gStringVar1 - ldr r1, =gSaveBlock2Ptr - ldr r1, [r1] - bl StringCopy - movs r0, 0x2D - bl _08016876 - .pool -_08015A80: - bl sub_8016B00 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _08015AA2 - cmp r0, 0x2 - bgt _08015A96 - cmp r0, 0x1 - beq _08015A9C - b _08015AD0 -_08015A96: - cmp r0, 0x4 - beq _08015AAA - b _08015AD0 -_08015A9C: - movs r0, 0x2 - bl PlaySE -_08015AA2: - adds r0, r6, 0 - bl sub_801A274 - b _08015AD0 -_08015AAA: - movs r0, 0xB - strb r0, [r6, 0x14] - bl sub_80181CC - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010FCC - adds r0, r6, 0 - bl sub_80181DC - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - movs r0, 0x53 - movs r2, 0 - bl sub_8011090 -_08015AD0: - adds r0, r6, 0 - bl sub_801A284 - bl _08016878 -_08015ADA: - ldr r0, =sub_809FA34 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - beq _08015AEA - bl _08016878 -_08015AEA: - movs r0, 0x40 - movs r1, 0 - movs r2, 0 - bl sub_8011090 - movs r0, 0x4 - bl _08016876 - .pool -_08015B00: - bl sub_801704C - movs r3, 0x2 - ldrsh r0, [r7, r3] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - ldr r0, [r6] - ldrb r1, [r7] - ldrb r2, [r7, 0x2] - adds r3, r4, 0 - bl sub_80179D4 - cmp r0, 0x1 - beq _08015B44 - cmp r0, 0x1 - bgt _08015B36 - cmp r0, 0 - beq _08015B3E - bl _08016878 -_08015B36: - cmp r0, 0x2 - beq _08015B68 - bl _08016878 -_08015B3E: - movs r0, 0x1A - bl _08016876 -_08015B44: - movs r1, 0x2 - ldrsh r0, [r7, r1] - lsls r0, 5 - ldr r1, [r6] - adds r1, r0 - adds r0, r1, 0 - adds r0, 0x10 - ldr r2, =gUnknown_02022C2C - ldrb r2, [r2] - bl sub_8012188 - strh r5, [r6, 0x12] - movs r0, 0x19 - bl _08016876 - .pool -_08015B68: - ldr r1, =gStringVar4 - movs r0, 0x13 - bl sub_8015664 - bl _08016878 - .pool -_08015B78: - bl sub_801704C - bl sub_8011A74 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1 - blt _08015BBE - cmp r4, 0x2 - ble _08015B9A - cmp r4, 0x4 - bne _08015BBE - movs r0, 0x1 - bl sub_801818C - strb r4, [r6, 0x14] - b _08015BBE -_08015B9A: - bl sub_8011B90 - cmp r0, 0x1 - bne _08015BB0 - ldr r0, =gUnknown_082EE6C8 - bl sub_801568C - b _08015BB8 - .pool -_08015BB0: - ldr r1, =gUnknown_082EE6C8 - movs r0, 0x1E - bl sub_8015664 -_08015BB8: - ldr r1, =gUnknown_02022C2C - movs r0, 0x40 - strb r0, [r1] -_08015BBE: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _08015BCA - bl _08016878 -_08015BCA: - ldr r0, =gBlockSendBuffer - movs r1, 0x1 - bl sub_80143E4 - ldr r0, =sub_80140E0 - movs r1, 0x5 - bl CreateTask - movs r0, 0x26 - bl _08016876 - .pool -_08015BF4: - ldr r0, =sub_80140E0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - beq _08015C04 - bl _08016878 -_08015C04: - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - cmp r0, 0x44 - bne _08015C24 - ldr r1, =gUnknown_082EE004 - movs r0, 0x1F - bl sub_8015664 - bl _08016878 - .pool -_08015C24: - movs r0, 0x5 - bl _08016876 -_08015C2A: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _08015C36 - bl _08016878 -_08015C36: - movs r0, 0 - bl sub_801818C - movs r2, 0 - ldrsh r0, [r7, r2] - movs r3, 0x2 - ldrsh r1, [r7, r3] - ldr r2, [r6] - bl sub_801A3D0 - movs r0, 0x2 - bl _08016876 - .pool -_08015C54: - adds r0, r6, 0 - adds r0, 0x16 - adds r1, r6, 0 - adds r1, 0x1B - adds r2, r6, 0 - adds r2, 0x1C - ldr r3, =gUnknown_082F021C - ldr r4, =gUnknown_082F0244 - str r4, [sp] - bl sub_8017178 - adds r5, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - bne _08015C78 - bl _08016878 -_08015C78: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _08015C94 - movs r0, 0x1C - bl _08016876 - .pool -_08015C94: - adds r1, r6, 0 - adds r1, 0x98 - movs r0, 0 - strh r0, [r1] - movs r2, 0x2 - ldrsh r0, [r7, r2] - ldr r1, [r6] - bl sub_8017CF8 - movs r0, 0x2 - negs r0, r0 - cmp r5, r0 - beq _08015CB2 - cmp r5, 0x40 - bne _08015CE4 -_08015CB2: - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0x40 - strh r1, [r0] - bl sub_800FE50 - ldr r0, =gStringVar4 - ldr r2, =gUnknown_082EEB80 - ldr r1, =gLinkPlayers - ldrb r1, [r1, 0x13] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - movs r0, 0x20 - bl _08016876 - .pool -_08015CE4: - ldr r0, =gUnknown_02022C2C - strb r5, [r0] - ldr r1, =gUnknown_02022C2D - lsrs r0, r5, 8 - strb r0, [r1] - lsls r0, r5, 24 - lsrs r0, 24 - cmp r0, 0x41 - bne _08015D18 - bl sub_8018024 - cmp r0, 0 - bne _08015D18 - ldr r1, =gUnknown_082EEBD0 - movs r0, 0x5 - bl sub_8015664 - bl _08016878 - .pool -_08015D18: - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - movs r1, 0x40 - orrs r1, r0 - adds r0, r6, 0 - adds r0, 0x4C - strh r1, [r0] - bl sub_800FE50 - movs r0, 0x1B - bl _08016876 - .pool -_08015D34: - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EEB88 - bl StringCopy - movs r0, 0x24 - bl _08016876 - .pool -_08015D4C: - adds r0, r6, 0 - bl sub_8017FD8 - movs r3, 0x2 - ldrsh r0, [r7, r3] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - adds r0, r6, 0 - adds r0, 0x4C - ldrh r1, [r0] - movs r0, 0x3F - ands r0, r1 - bl sub_8017984 - adds r5, r0, 0 - adds r0, r6, 0 - adds r0, 0x16 - ldr r3, =gUnknown_082EE82C - lsls r1, r5, 2 - lsls r2, r4, 4 - adds r1, r2 - adds r1, r3 - ldr r1, [r1] - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _08015D8C - bl _08016878 -_08015D8C: - movs r0, 0 - strh r0, [r7, 0x6] - movs r0, 0x1D - bl _08016876 - .pool -_08015D9C: - bl sub_800AC34 - movs r0, 0x24 - bl _08016876 -_08015DA6: - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0x44 - strh r1, [r0] - ldr r2, =gUnknown_02022C40 - ldrh r1, [r2, 0xE] - adds r3, r6, 0 - adds r3, 0x4E - strh r1, [r3] - ldrh r2, [r2, 0x10] - adds r1, r6, 0 - adds r1, 0x50 - strh r2, [r1] - bl sub_800FE50 - movs r0, 0x1D - bl _08016876 - .pool -_08015DD0: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _08015DF4 - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EEB88 - bl StringCopy - movs r0, 0x1C - bl _08016876 - .pool -_08015DF4: - adds r0, r6, 0 - bl sub_8017FD8 - adds r0, r6, 0 - adds r0, 0x98 - ldrh r0, [r0] - cmp r0, 0x51 - bne _08015E2A - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - cmp r0, 0x8 - bne _08015E24 - ldr r0, =gStringVar4 - adds r1, r6, 0 - movs r2, 0 - bl sub_8018220 - movs r0, 0x28 - bl _08016876 - .pool -_08015E24: - movs r0, 0xD - bl _08016876 -_08015E2A: - cmp r0, 0x52 - beq _08015E32 - bl _08016878 -_08015E32: - movs r5, 0 - movs r0, 0x20 - strb r0, [r6, 0x14] - ldr r0, =gStringVar4 - ldr r4, =gUnknown_02022C2C - ldrb r2, [r4] - movs r1, 0x40 - orrs r1, r2 - ldr r2, =gLinkPlayers - ldrb r2, [r2, 0x13] - bl sub_8017D9C - strb r5, [r4] - bl _08016878 - .pool -_08015E5C: - movs r0, 0x2 - ldrsh r1, [r7, r0] - lsls r1, 5 - ldr r0, [r6] - adds r0, r1 - bl sub_80179AC - adds r5, r0, 0 - movs r1, 0x2 - ldrsh r0, [r7, r1] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - ldr r2, =gUnknown_082EE24C - lsls r0, r4, 2 - lsls r1, r5, 3 - adds r0, r1 - adds r0, r2 - ldr r1, [r0] - movs r0, 0x6 - bl sub_8015664 - bl _08016878 - .pool -_08015E94: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gStringVar4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _08015EA8 - bl _08016878 -_08015EA8: - movs r4, 0 - movs r0, 0x29 - strb r0, [r6, 0x14] - bl sub_800ADF8 - adds r0, r6, 0 - adds r0, 0x98 - strh r4, [r0] - adds r0, 0x2 - strh r4, [r0] - bl _08016878 - .pool -_08015EC4: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - bne _08015ED2 - bl _08016878 -_08015ED2: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _08015F2C - ldr r5, =gStringVar1 - bl GetMultiplayerId - movs r1, 0x1 - eors r0, r1 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - ldr r4, =gLinkPlayers + 8 - adds r1, r4 - adds r0, r5, 0 - bl StringCopy - ldrh r0, [r4, 0x18] - adds r4, 0x1C - adds r1, r4, 0 - bl sub_800E540 - adds r5, r0, 0 - ldr r0, =gStringVar4 - ldr r2, =gUnknown_082EE378 - lsls r1, r5, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - movs r0, 0x21 - bl _08016876 - .pool -_08015F2C: - movs r0, 0x7 - bl _08016876 -_08015F32: - adds r0, r6, 0 - adds r0, 0x16 - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r5, r0, 24 - cmp r5, 0 - beq _08015F5C - cmp r5, 0 - bgt _08015F54 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - beq _08015F98 - bl _08016878 -_08015F54: - cmp r5, 0x1 - beq _08015F98 - bl _08016878 -_08015F5C: - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldr r4, =gUnknown_02022C2C - movs r0, 0x45 - strb r0, [r4] - movs r0, 0x45 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - movs r2, 0x2 - ldrsh r0, [r7, r2] - lsls r0, 5 - ldr r1, [r6] - adds r1, r0 - adds r0, r1, 0 - adds r0, 0x10 - ldrb r2, [r4] - bl sub_8012188 - ldrh r0, [r7, 0x2] - strh r0, [r6, 0x12] - movs r0, 0x14 - strb r0, [r6, 0x14] - strh r5, [r7, 0x6] - bl _08016878 - .pool -_08015F98: - movs r3, 0x2 - ldrsh r0, [r7, r3] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - ldr r1, =gUnknown_082EEC9C - lsls r0, r4, 2 - adds r0, r1 - ldr r0, [r0] - bl sub_801568C - bl _08016878 - .pool -_08015FB8: - ldrh r0, [r7, 0x4] - adds r0, 0x1 - strh r0, [r7, 0x4] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3C - bgt _08015FCA - bl _08016878 -_08015FCA: - movs r1, 0 - movs r0, 0x15 - strb r0, [r6, 0x14] - strh r1, [r7, 0x4] - bl _08016878 -_08015FD6: - bl sub_8011A74 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - beq _0801603C - cmp r4, 0x3 - ble _08015FF4 - cmp r4, 0x4 - bne _08016040 - movs r0, 0x1 - bl sub_801818C - strb r4, [r6, 0x14] - b _08016040 -_08015FF4: - cmp r4, 0x1 - blt _08016040 - movs r1, 0x2 - ldrsh r0, [r7, r1] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - bl sub_8011B90 - cmp r0, 0x1 - bne _08016028 - ldr r0, =gUnknown_082EED3C - lsls r1, r4, 2 - adds r1, r0 - ldr r0, [r1] - bl sub_801568C - b _08016040 - .pool -_08016028: - ldr r0, =gUnknown_082EED3C - lsls r1, r4, 2 - adds r1, r0 - ldr r1, [r1] - movs r0, 0x1E - bl sub_8015664 - b _08016040 - .pool -_0801603C: - movs r0, 0x16 - strb r0, [r6, 0x14] -_08016040: - ldrh r0, [r7, 0x6] - adds r0, 0x1 - strh r0, [r7, 0x6] - bl _08016878 -_0801604A: - bl sub_8011A80 - cmp r0, 0 - beq _08016092 - movs r2, 0x2 - ldrsh r0, [r7, r2] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - bl sub_8011B90 - cmp r0, 0x1 - bne _08016084 - ldr r0, =gUnknown_082EED3C - lsls r1, r4, 2 - adds r1, r0 - ldr r0, [r1] - bl sub_801568C - b _08016092 - .pool -_08016084: - ldr r0, =gUnknown_082EED3C - lsls r1, r4, 2 - adds r1, r0 - ldr r1, [r1] - movs r0, 0x1E - bl sub_8015664 -_08016092: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _0801609E - bl _08016878 -_0801609E: - movs r0, 0x10 - bl _08016876 - .pool -_080160AC: - movs r0, 0x49 - bl PlaySE - bl sub_800EF7C - movs r0, 0 - movs r1, 0xC - strb r1, [r6, 0x14] - adds r1, r6, 0 - adds r1, 0x9A - strh r0, [r1] - bl _08016878 -_080160C6: - bl sub_8011A80 - cmp r0, 0 - beq _080160DA - movs r0, 0 - bl sub_801818C - movs r0, 0x2 - bl _08016876 -_080160DA: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _080160E4 - b _08016878 -_080160E4: - ldr r0, =gBlockSendBuffer - movs r1, 0x1 - bl sub_80143E4 - ldr r0, =sub_80140E0 - movs r1, 0x5 - bl CreateTask - movs r0, 0x27 - b _08016876 - .pool -_08016104: - adds r0, r6, 0 - bl sub_801689C - ldr r0, =sub_80140E0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - beq _08016118 - b _08016878 -_08016118: - movs r0, 0x21 - strb r0, [r6, 0x14] - ldr r0, =gStringVar1 - ldr r4, =gLinkPlayers + 0x1C + 0x08 @ &gLinkPlayers[1].name - adds r1, r4, 0 - bl StringCopy - adds r0, r4, 0 - subs r0, 0x24 - ldrh r0, [r0, 0x20] - adds r1, r4, 0 - bl sub_800E540 - adds r5, r0, 0 - ldr r0, =gStringVar4 - ldr r2, =gUnknown_082EE324 - lsls r1, r5, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - b _08016878 - .pool -_08016158: - adds r0, r6, 0 - bl sub_801689C - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gStringVar4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _08016170 - b _08016878 -_08016170: - movs r0, 0x22 - b _08016876 - .pool -_08016178: - adds r0, r6, 0 - bl sub_801689C - adds r0, r6, 0 - bl sub_80168DC - cmp r0, 0 - bne _0801618A - b _08016878 -_0801618A: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08016198 - b _08016878 -_08016198: - movs r0, 0x1 - bl sub_8011DE0 - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EE598 - bl StringCopy - movs r0, 0x24 - b _08016876 - .pool -_080161B8: - ldr r1, =gStringVar4 - movs r0, 0x9 - bl sub_8015664 - b _08016878 - .pool -_080161C8: - adds r0, r6, 0 - adds r0, 0x16 - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080161EE - cmp r1, 0 - bgt _080161E8 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080162AE - b _08016878 -_080161E8: - cmp r1, 0x1 - beq _080162AE - b _08016878 -_080161EE: - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0x51 - strh r1, [r0] - ldr r1, =gUnknown_02022C2C - ldrb r1, [r1] - adds r5, r0, 0 - cmp r1, 0x45 - bne _08016220 - movs r4, 0x40 - orrs r4, r1 - movs r0, 0x1 - bl sub_801100C - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - movs r2, 0 - bl sub_8011090 - b _0801623E - .pool -_08016220: - movs r0, 0x40 - adds r4, r1, 0 - orrs r4, r0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - bl sub_801100C - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - movs r2, 0x1 - bl sub_8011090 -_0801623E: - ldr r1, [r6, 0x8] - movs r0, 0 - strb r0, [r1, 0x1B] - strh r0, [r7, 0x6] - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - cmp r0, 0x41 - bne _08016286 - bl sub_8018024 - cmp r0, 0 - bne _0801627C - movs r0, 0x52 - strh r0, [r5] - adds r0, r5, 0 - bl sub_800FE50 - movs r0, 0xA - strb r0, [r6, 0x14] - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EEC14 - bl StringCopy - b _08016878 - .pool -_0801627C: - adds r0, r5, 0 - bl sub_800FE50 - movs r0, 0xD - b _08016876 -_08016286: - cmp r0, 0x48 - bne _080162A4 - adds r0, r5, 0 - bl sub_800FE50 - ldr r0, =gStringVar4 - adds r1, r6, 0 - movs r2, 0x1 - bl sub_8018220 - movs r0, 0x28 - b _08016876 - .pool -_080162A4: - adds r0, r5, 0 - bl sub_800FE50 - movs r0, 0xD - b _08016876 -_080162AE: - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0x52 - strh r1, [r0] - bl sub_800FE50 - movs r0, 0xA - strb r0, [r6, 0x14] - ldr r0, =gStringVar4 - ldr r1, =gUnknown_02022C2C - ldrb r1, [r1] - bl sub_8013078 - b _08016878 - .pool -_080162D4: - bl sub_800AC34 - movs r0, 0x24 - b _08016876 -_080162DC: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r4, [r0] - cmp r4, 0 - beq _080162E6 - b _08016878 -_080162E6: - ldr r1, =gUnknown_02022C2C - movs r0, 0x40 - strb r0, [r1] - ldr r1, =gStringVar4 - movs r0, 0x25 - bl sub_8015664 - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0 - movs r2, 0xC - bl memset - adds r0, r6, 0 - adds r0, 0x9A - strh r4, [r0] - subs r0, 0x2 - strh r4, [r0] - b _08016878 - .pool -_08016318: - movs r0, 0x2 - strb r0, [r6, 0x14] - movs r0, 0 - bl sub_801818C - b _08016878 -_08016324: - ldr r4, =gStringVar4 - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - movs r1, 0x40 - orrs r1, r0 - adds r0, r4, 0 - bl sub_8017E00 - movs r0, 0xE - adds r1, r4, 0 - bl sub_8015664 - b _08016878 - .pool -_08016348: - bl sub_800ADF8 - movs r0, 0xF - b _08016876 -_08016350: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - bne _0801635C - b _08016878 -_0801635C: - movs r0, 0x10 - b _08016876 -_08016360: - ldr r0, [r6, 0x8] - bl Free - ldr r0, [r6] - bl Free - ldr r0, [r6, 0xC] - bl Free - ldr r0, [r6, 0x4] - bl Free - adds r0, r6, 0 - adds r0, 0x20 - ldrb r0, [r0] - bl DestroyTask - adds r0, r6, 0 - adds r0, 0x21 - bl sub_8019F04 - movs r0, 0x11 - b _08016876 -_0801638E: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - movs r0, 0x12 - b _08016876 -_080163A2: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - beq _080163AE - b _08016878 -_080163AE: - bl sub_8019E3C - adds r0, r4, 0 - bl DestroyTask - ldr r0, =gUnknown_02022C30 - ldr r0, [r0] - bl Free - bl sub_80149D8 - b _08016878 - .pool -_080163CC: - bl sub_800F7DC - ldrh r1, [r0, 0x8] - ldr r4, =0x000003ff - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - bne _080163E4 - movs r0, 0x2B - b _08016876 - .pool -_080163E4: - bl sub_800F7DC - ldrh r1, [r0, 0x8] - adds r0, r4, 0 - ands r0, r1 - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - bne _08016408 - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EF590 - bl StringCopy - b _0801643E - .pool -_08016408: - ldr r4, =gStringVar1 - bl sub_800F7DC - ldrh r0, [r0, 0x8] - lsls r0, 22 - lsrs r0, 22 - movs r1, 0xB - muls r1, r0 - ldr r0, =gSpeciesNames - adds r1, r0 - adds r0, r4, 0 - bl StringCopy - ldr r4, =gStringVar2 - bl sub_800F7DC - ldrb r1, [r0, 0xB] - lsrs r1, 1 - adds r0, r4, 0 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EF564 - bl StringExpandPlaceholders -_0801643E: - ldr r1, =gStringVar4 - movs r0, 0x2C - bl sub_8015664 - b _08016878 - .pool -_0801645C: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gUnknown_082EF20C - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _0801646E - b _08016878 -_0801646E: - movs r0, 0x2F - b _08016876 - .pool -_08016478: - adds r0, r6, 0 - adds r0, 0x16 - adds r1, r6, 0 - adds r1, 0x1D - adds r2, r6, 0 - adds r2, 0x1E - ldr r3, =gUnknown_082F025C - ldr r4, =gUnknown_082F027C - str r4, [sp] - bl sub_8017178 - adds r5, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - bne _0801649A - b _08016878 -_0801649A: - subs r0, 0x1 - cmp r5, r0 - beq _080164A4 - cmp r5, 0x3 - bne _080164B8 -_080164A4: - movs r0, 0x4 - strb r0, [r6, 0x14] - movs r0, 0x1 - bl sub_801818C - b _08016878 - .pool -_080164B8: - cmp r5, 0x1 - beq _080164C2 - cmp r5, 0x2 - beq _080164D0 - b _08016878 -_080164C2: - ldr r1, =gUnknown_082EF4C4 - movs r0, 0x35 - bl sub_8015664 - b _08016878 - .pool -_080164D0: - ldr r1, =gUnknown_082EF298 - movs r0, 0x2F - bl sub_8015664 - b _08016878 - .pool -_080164E0: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - movs r0, 0x36 - b _08016876 -_080164F4: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08016502 - b _08016878 -_08016502: - ldr r1, =gUnknown_02022C40 - movs r0, 0x1 - strh r0, [r1] - ldr r1, =gFieldCallback - ldr r0, =sub_80AF128 - str r0, [r1] - ldr r1, =CB2_ReturnToField - movs r0, 0x8 - bl sub_81B8904 - b _08016878 - .pool -_0801652C: - adds r0, r6, 0 - adds r0, 0x16 - adds r1, r6, 0 - adds r1, 0x1D - adds r2, r6, 0 - adds r2, 0x1E - ldr r3, =gUnknown_082F0294 - ldr r4, =gUnknown_082F032C - str r4, [sp] - bl sub_8017178 - adds r5, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - bne _0801654E - b _08016878 -_0801654E: - subs r0, 0x1 - cmp r5, r0 - beq _08016558 - cmp r5, 0x12 - bne _08016580 -_08016558: - ldr r0, =gUnknown_02022C40 - bl sub_801807C - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010FCC - ldr r0, =gUnknown_082EF4FC - bl sub_801568C - b _08016878 - .pool -_08016580: - ldr r0, =gUnknown_02022C40 - strh r5, [r0, 0x2] - movs r0, 0x37 - b _08016876 - .pool -_0801658C: - ldr r2, =gUnknown_02022C40 - ldrh r0, [r2, 0x2] - ldrh r1, [r2, 0xA] - ldrh r2, [r2, 0xC] - bl sub_8010FCC - ldr r0, =gUnknown_082EF520 - bl sub_801568C - b _08016878 - .pool -_080165A8: - adds r0, r6, 0 - adds r0, 0x16 - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080165CE - cmp r1, 0 - bgt _080165C8 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080165D2 - b _08016878 -_080165C8: - cmp r1, 0x1 - beq _080165D2 - b _08016878 -_080165CE: - movs r0, 0x38 - b _08016876 -_080165D2: - movs r0, 0x1 - bl sub_801818C - movs r0, 0x4 - b _08016876 -_080165DC: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gUnknown_082EF5B8 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _080165EE - b _08016878 -_080165EE: - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010FCC - ldr r0, =gUnknown_02022C40 - bl sub_801807C - movs r0, 0x1 - bl sub_801818C - movs r0, 0x4 - b _08016876 - .pool -_08016610: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gUnknown_082EF1EC - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _08016622 - b _08016878 -_08016622: - movs r0, 0x2E - b _08016876 - .pool -_0801662C: - bl sub_80173B0 - movs r0, 0x30 - b _08016876 -_08016634: - adds r0, r6, 0 - adds r0, 0x16 - adds r1, r6, 0 - adds r1, 0x1D - adds r2, r6, 0 - adds r2, 0x4A - adds r3, r6, 0 - adds r3, 0x1E - ldr r4, =gUnknown_082F034C - str r4, [sp] - ldr r4, =gUnknown_082F03A4 - str r4, [sp, 0x4] - ldr r4, [r6] - str r4, [sp, 0x8] - bl sub_80172A0 - adds r5, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - bne _08016660 - b _08016878 -_08016660: - subs r0, 0x1 - cmp r5, r0 - beq _0801666A - cmp r5, 0x8 - bne _0801667C -_0801666A: - movs r0, 0x1 - bl sub_801818C - movs r0, 0x4 - b _08016876 - .pool -_0801667C: - bl sub_80173B0 - ldr r1, [r6] - lsls r4, r5, 5 - adds r1, r4 - ldrb r0, [r1, 0x9] - lsrs r0, 2 - ldrh r1, [r1, 0x8] - lsls r1, 22 - lsrs r1, 22 - bl sub_8017D04 - cmp r0, 0x1 - beq _080166C8 - cmp r0, 0x1 - bgt _080166A2 - cmp r0, 0 - beq _080166A8 - b _08016878 -_080166A2: - cmp r0, 0x2 - beq _080166FC - b _08016878 -_080166A8: - ldr r0, =gStringVar1 - ldr r1, [r6] - adds r1, r4 - bl sub_8018404 - ldr r1, =gUnknown_082EF65C - movs r0, 0x31 - bl sub_8015664 - strh r5, [r7, 0x2] - b _08016878 - .pool -_080166C8: - ldr r0, =gStringVar1 - ldr r1, [r6] - adds r1, r4 - bl sub_8018404 - ldr r0, =gStringVar2 - ldr r1, [r6] - adds r1, r4 - ldrb r2, [r1, 0x9] - lsrs r2, 2 - lsls r1, r2, 3 - subs r1, r2 - ldr r2, =gTypeNames - adds r1, r2 - bl StringCopy - ldr r1, =gUnknown_082EF6E4 - b _0801671E - .pool -_080166FC: - ldr r0, =gStringVar1 - ldr r1, [r6] - adds r1, r4 - bl sub_8018404 - ldr r0, =gStringVar2 - ldr r1, [r6] - adds r1, r4 - ldrb r2, [r1, 0x9] - lsrs r2, 2 - lsls r1, r2, 3 - subs r1, r2 - ldr r2, =gTypeNames - adds r1, r2 - bl StringCopy - ldr r1, =gUnknown_082EF718 -_0801671E: - movs r0, 0x2E - bl sub_8015664 - b _08016878 - .pool -_08016738: - adds r0, r6, 0 - adds r0, 0x16 - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _0801675E - cmp r1, 0 - bgt _08016758 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08016762 - b _08016878 -_08016758: - cmp r1, 0x1 - beq _08016762 - b _08016878 -_0801675E: - movs r0, 0x32 - b _08016876 -_08016762: - movs r0, 0x1 - bl sub_801818C - movs r0, 0x4 - b _08016876 -_0801676C: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gUnknown_082EF4C4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _0801677E - b _08016878 -_0801677E: - ldr r4, =gUnknown_02022C40 - movs r0, 0x2 - strh r0, [r4] - ldr r2, =gUnknown_02022C38 - movs r3, 0x2 - ldrsh r0, [r7, r3] - ldr r1, [r6] - lsls r0, 5 - adds r0, r1 - ldr r0, [r0] - str r0, [r2] - ldr r2, =gUnknown_02022C3E - ldr r1, [r6] - movs r3, 0x2 - ldrsh r0, [r7, r3] - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1, 0x9] - lsrs r0, 2 - strb r0, [r2] - ldr r2, =gUnknown_02022C3C - ldr r1, [r6] - movs r3, 0x2 - ldrsh r0, [r7, r3] - lsls r0, 5 - adds r1, r0 - ldrh r0, [r1, 0x8] - lsls r0, 22 - lsrs r0, 22 - strh r0, [r2] - ldr r1, =gFieldCallback - ldr r0, =sub_80AF128 - str r0, [r1] - ldr r1, =CB2_ReturnToField - movs r0, 0x9 - bl sub_81B8904 - adds r0, r6, 0 - bl sub_80156B0 - ldrh r0, [r7, 0x2] - strb r0, [r4, 0x8] - b _08016878 - .pool -_080167F4: - ldr r1, =gUnknown_02022C2C - movs r0, 0x44 - strb r0, [r1] - movs r1, 0x2 - ldrsh r0, [r7, r1] - lsls r0, 5 - ldr r1, [r6] - adds r1, r0 - adds r0, r1, 0 - adds r0, 0x10 - movs r2, 0x44 - bl sub_8012188 - ldr r0, =gStringVar1 - movs r3, 0x2 - ldrsh r2, [r7, r3] - lsls r2, 5 - ldr r1, [r6] - adds r1, r2 - bl sub_8018404 - ldr r0, =gUnknown_082EE17C - ldr r0, [r0, 0x8] - bl sub_8017020 - movs r0, 0x19 - b _08016876 - .pool -_08016838: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gStringVar4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - beq _08016878 - movs r0, 0x1 - bl sub_801818C - movs r1, 0 - ldrsh r0, [r7, r1] - movs r2, 0x2 - ldrsh r1, [r7, r2] - ldr r2, [r6] - bl sub_801A3D0 - movs r0, 0x4 - b _08016876 - .pool -_08016864: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gStringVar4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - beq _08016878 - ldrb r0, [r6, 0x15] -_08016876: - strb r0, [r6, 0x14] -_08016878: - add sp, 0xC - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80156E0 - - thumb_func_start var_800D_set_xB -var_800D_set_xB: @ 8016884 - push {lr} - bl InUnionRoom - cmp r0, 0x1 - bne _08016894 - ldr r1, =gSpecialVar_Result - movs r0, 0xB - strh r0, [r1] -_08016894: - pop {r0} - bx r0 - .pool - thumb_func_end var_800D_set_xB thumb_func_start sub_801689C sub_801689C: @ 801689C diff --git a/include/librfu.h b/include/librfu.h index 03c142587..dc3d336da 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -47,7 +47,7 @@ enum RFU_UNK3A, RFU_UNK3B, RFU_UNK3C, - RFU_STOP_MODE, //3D + RFU_STOP_MODE, // 3D }; struct RfuPacket8 @@ -67,7 +67,7 @@ union RfuPacket struct RfuPacket8 rfuPacket8; }; -struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 +struct UnkLinkRfuStruct_02022B14Substruct { u16 unk_00_0:4; u16 unk_00_4:1; @@ -79,6 +79,11 @@ struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 u16 unk_01_2:4; u16 unk_01_6:2; u8 playerTrainerId[2]; +}; + +struct UnkLinkRfuStruct_02022B14 +{ + struct UnkLinkRfuStruct_02022B14Substruct unk_00; u8 unk_04[4]; u16 species:10; u16 type:6; diff --git a/include/link_rfu.h b/include/link_rfu.h index 52006be44..c3ca75604 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -263,6 +263,6 @@ void sub_800FE50(u16 *a0); bool32 sub_800E540(u16 id, u8 *name); void sub_8011DE0(u32 arg0); u8 sub_801100C(int a0); -void sub_800FE50(u16 *a0); +void sub_800EF7C(void); #endif //GUARD_LINK_RFU_H diff --git a/src/link_rfu.c b/src/link_rfu.c index b539c31d6..29256899d 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -2126,7 +2126,7 @@ void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, int r for (i = 0; i < 2; i++) { - data->playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; + data->unk_00.playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; } for (i = 0; i < 4; i++) { @@ -2136,14 +2136,14 @@ void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, int r data->playerGender = gSaveBlock2Ptr->playerGender; data->unk_0a_0 = r9; data->unk_0a_7 = r2; - data->unk_00_0 = 2; - data->unk_01_2 = 3; - data->unk_00_4 = 0; - data->unk_00_5 = 0; - data->unk_00_6 = 0; - data->unk_00_7 = FlagGet(FLAG_0x87F); - data->unk_01_0 = IsNationalPokedexEnabled(); - data->unk_01_1 = FlagGet(FLAG_SYS_GAME_CLEAR); + data->unk_00.unk_00_0 = 2; + data->unk_00.unk_01_2 = 3; + data->unk_00.unk_00_4 = 0; + data->unk_00.unk_00_5 = 0; + data->unk_00.unk_00_6 = 0; + data->unk_00.unk_00_7 = FlagGet(FLAG_0x87F); + data->unk_00.unk_01_0 = IsNationalPokedexEnabled(); + data->unk_00.unk_01_1 = FlagGet(FLAG_SYS_GAME_CLEAR); } bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) @@ -2155,12 +2155,12 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) retVal = TRUE; if (sub_8010454(gUnknown_03007890->unk_14[idx].unk_04) && ((gUnknown_03007890->unk_07 >> idx) & 1)) { - memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, sizeof(gUnknown_03007890->unk_14[idx].unk_06)); + memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD); memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); } else { - memset(buff1, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_06)); + memset(buff1, 0, 0xD); memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); } } @@ -2169,12 +2169,12 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) retVal = FALSE; if (sub_8010454(gUnknown_03007890->unk_14[idx].unk_04)) { - memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, sizeof(gUnknown_03007890->unk_14[idx].unk_06)); + memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD); memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); } else { - memset(buff1, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_06)); + memset(buff1, 0, 0xD); memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); } } @@ -4512,14 +4512,14 @@ void sub_8010F84(u8 a0, u32 a1, u32 a2) void sub_8010FA0(bool32 a0, bool32 a1) { - gUnknown_02022B14.unk_00_4 = a0; - gUnknown_02022B14.unk_00_5 = a1; + gUnknown_02022B14.unk_00.unk_00_4 = a0; + gUnknown_02022B14.unk_00.unk_00_5 = a1; } void sub_8010FCC(u32 a0, u32 a1, u32 a2) { - gUnknown_02022B14.unk_09_2 = a0; - gUnknown_02022B14.unk_08_0 = a1; + gUnknown_02022B14.type = a0; + gUnknown_02022B14.species = a1; gUnknown_02022B14.unk_0b_1 = a2; } diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 2f1c413b9..81aef45c6 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -38,9 +38,6 @@ extern void HealPlayerParty(void); struct UnkStruct_Shared { struct UnkLinkRfuStruct_02022B14 field_0; - u8 field_xD; - u8 field_E; - u8 field_xF; u8 playerName[PLAYER_NAME_LENGTH]; }; @@ -119,6 +116,14 @@ struct UnkStruct_Group u8 field_15; }; +struct UnkStruct_8019BA8 +{ + u8 field_0; + u8 field_1; + u8 field_2; + u8 field_3; +}; + struct UnkStruct_URoom { struct UnkStruct_Main0 *field_0; @@ -128,7 +133,7 @@ struct UnkStruct_URoom u16 field_10; u16 field_12; u8 state; - u8 field_15; + u8 stateAfterPrint; u8 textState; u8 field_17; u8 field_18; @@ -141,11 +146,15 @@ struct UnkStruct_URoom u8 field_1F; u8 field_20; u8 spriteIds[40]; + u8 field_49; u8 field_4A; u16 field_4C[6]; u8 field_58[0x98 - 0x58]; u16 field_98; u16 field_9A; + u16 field_9C; + u16 field_9E; + struct UnkStruct_8019BA8 field_A0[8]; }; union UnkUnion_Main @@ -176,6 +185,9 @@ extern union UnkUnion_Main gUnknown_02022C30; extern u8 gUnknown_02022C2C; extern u8 gUnknown_02022C2D; +extern u8 gUnknown_02022C3E; +extern u16 gUnknown_02022C3C; +extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; extern u8 gFieldLinkPlayerCount; extern u8 gUnknown_03005DB4; @@ -237,7 +249,7 @@ s8 sub_8018B08(u8 *textState, u8 *arg1, u8 arg2, const u8 *str); bool32 sub_8016F1C(struct UnkStruct_x20 *arg0, s16 arg1); u8 sub_8016DF0(struct UnkStruct_Main4 *arg0, struct UnkStruct_Main4 *arg1, u32 arg2); void sub_8019F2C(void); -s16 sub_8019E70(u8 *arg0, s32 arg1); +void sub_8019E70(u8 *arg0, s32 arg1); bool32 sub_80180A0(u8 monId, struct TradeUnkStruct *arg1); void sub_80180E8(u8 monId, struct TradeUnkStruct *arg1); bool32 sub_801A2A8(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3); @@ -246,13 +258,13 @@ bool32 sub_8017940(void); u8 sub_8016B00(void); void sub_801A274(struct UnkStruct_URoom *arg0); void sub_801A284(struct UnkStruct_URoom *arg0); -void sub_8017FD8(struct UnkStruct_URoom *arg0); +bool32 sub_8017FD8(struct UnkStruct_URoom *arg0); void sub_801689C(struct UnkStruct_URoom *arg0); u8 sub_80181DC(struct UnkStruct_URoom *arg0); bool32 sub_80168DC(struct UnkStruct_URoom *arg0); bool32 sub_801704C(void); u32 sub_8017CF8(u32 arg1, struct UnkStruct_Main0 *arg0); -u32 sub_80179D4(struct UnkStruct_Main0 *arg0, u8 arg1, u8 arg2, u32 arg3); +s32 sub_80179D4(struct UnkStruct_Main0 *arg0, u8 arg1, u8 arg2, u32 playerGender); void sub_801818C(bool32 arg0); void sub_801A3D0(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2); s32 sub_8017178(u8 *arg0, u8 *arg1, u8 *arg2, const struct WindowTemplate *winTemplate, const struct ListMenuTemplate *menuTemplate); @@ -261,12 +273,14 @@ bool32 sub_8018024(void); u32 sub_8017984(u32 arg0); void sub_8018220(u8 *unused, struct UnkStruct_URoom *arg1, bool8 arg2); void sub_8017D9C(u8 *dst, u32 arg1, u32 playerGender); -s32 sub_80179AC(struct UnkStruct_x20 *arg0); +u32 sub_80179AC(struct UnkStruct_x20 *arg0); void sub_8017E00(u8 *dst, u8 arg1); void sub_8019F04(u8 *spriteIds); void sub_8019E3C(void); void sub_80173B0(void); s32 sub_8017D04(u32 type, u32 species); +void sub_8017020(const u8 *src); +void sub_8019BA8(); // const rom data extern const u8 *const gUnknown_082EDB60[][5]; @@ -317,6 +331,8 @@ extern const u8 gUnknown_082EF564[]; extern const u8 gUnknown_082EF4C4[]; extern const u8 gUnknown_082EF298[]; extern const u8 gUnknown_082EF65C[]; +extern const u8 gUnknown_082EF6E4[]; +extern const u8 gUnknown_082EF718[]; extern const u32 gUnknown_082F00C4[]; @@ -352,8 +368,10 @@ extern const u8 *const gUnknown_082EE378[]; extern const u8 *const gUnknown_082EEC9C[]; extern const u8 *const gUnknown_082EED3C[]; extern const u8 *const gUnknown_082EE324[]; +extern const u8 *const gUnknown_082EE17C[]; + +extern const u8 *const gUnknown_082EE82C[][4]; -extern const u8 *const gUnknown_082EE82C[][2]; extern const u8 *const gUnknown_082EE24C[][2]; extern const struct UnkStruct_Shared gUnknown_082F045C[]; @@ -579,19 +597,19 @@ void sub_8012780(u8 taskId) } break; case 11: - switch (sub_80170B8(&data->textState, sub_801064C(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName))) + switch (sub_80170B8(&data->textState, sub_801064C(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName))) { case 0: sub_800E0E8(); CreateWirelessStatusIndicatorSprite(0, 0); data->field_19 = 5; - sub_8010688(5, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + sub_8010688(5, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); data->state = 12; break; case 1: case -1: data->field_19 = 6; - sub_8010688(6, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + sub_8010688(6, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); data->state = 12; break; case -3: @@ -600,7 +618,7 @@ void sub_8012780(u8 taskId) } break; case 12: - val = sub_8010714(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + val = sub_8010714(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); if (val == 1) { if (data->field_19 == 5) @@ -631,7 +649,7 @@ void sub_8012780(u8 taskId) } else { - sub_8011DC0(data->field_0->arr[data->field_13].unk.playerName, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId)); + sub_8011DC0(data->field_0->arr[data->field_13].unk.playerName, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId)); data->field_0->arr[data->field_13].field_1A_0 = 0; sub_8013398(data->field_0); sub_81AE70C(data->listTaskId); @@ -1290,11 +1308,11 @@ u32 sub_8013B8C(struct UnkStruct_Group *arg0, s32 id) { struct UnkStruct_x20 *structPtr = &arg0->field_0->arr[id]; - if (gUnknown_02022C2C == 4 && structPtr->unk.field_0.unk_01_2 != 3) + if (gUnknown_02022C2C == 4 && structPtr->unk.field_0.unk_00.unk_01_2 != 3) { if (!(gSaveBlock2Ptr->specialSaveWarp & 0x80)) return 1; - else if (structPtr->unk.field_0.unk_00_7) + else if (structPtr->unk.field_0.unk_00.unk_00_7) return 0; } else @@ -1313,7 +1331,7 @@ void sub_8013BD8(struct UnkStruct_Group *data, s32 id) sub_81AE70C(data->listTaskId); sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]); sub_8011090(gUnknown_082F0530[gSpecialVar_0x8004], 0, 1); - sub_8011FC8(data->field_0->arr[data->field_F].unk.playerName, ReadAsU16(data->field_0->arr[data->field_F].unk.field_0.playerTrainerId)); + sub_8011FC8(data->field_0->arr[data->field_F].unk.playerName, ReadAsU16(data->field_0->arr[data->field_F].unk.field_0.unk_00.playerTrainerId)); } u8 sub_8013C40(void) @@ -1972,19 +1990,19 @@ void sub_8014A40(u8 taskId) data->field_0->arr[data->field_13].field_1B = 0; sub_81AE70C(data->listTaskId); data->field_19 = 5; - sub_8010688(5, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + sub_8010688(5, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); data->state = 8; break; case 1: case -1: data->field_19 = 6; - sub_8010688(6, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + sub_8010688(6, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); data->state = 8; break; } break; case 8: - val = sub_8010714(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); + val = sub_8010714(ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId), data->field_0->arr[data->field_13].unk.playerName); if (val == 1) { if (data->field_19 == 5) @@ -1999,7 +2017,7 @@ void sub_8014A40(u8 taskId) } else { - sub_8011DC0(data->field_0->arr[data->field_13].unk.playerName, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.playerTrainerId)); + sub_8011DC0(data->field_0->arr[data->field_13].unk.playerName, ReadAsU16(data->field_0->arr[data->field_13].unk.field_0.unk_00.playerTrainerId)); data->field_0->arr[data->field_13].field_1A_0 = 0; sub_8013398(data->field_0); sub_81AE70C(data->listTaskId); @@ -2174,7 +2192,7 @@ void sub_8014F48(u8 taskId) CreateWirelessStatusIndicatorSprite(0, 0); sub_81AE70C(data->listTaskId); sub_8018404(gStringVar1, &data->field_0->arr[data->field_F]); - sub_8011FC8(data->field_0->arr[data->field_F].unk.playerName, ReadAsU16(data->field_0->arr[data->field_F].unk.field_0.playerTrainerId)); + sub_8011FC8(data->field_0->arr[data->field_F].unk.playerName, ReadAsU16(data->field_0->arr[data->field_F].unk.field_0.unk_00.playerTrainerId)); PlaySE(SE_PN_ON); data->state = 4; } @@ -2335,7 +2353,7 @@ void sub_80152F4(u8 taskId) data->field_14 = 0; sub_800E0E8(); CreateWirelessStatusIndicatorSprite(0, 0); - sub_8011FC8(data->field_0->arr[0].unk.playerName, ReadAsU16(data->field_0->arr[0].unk.field_0.playerTrainerId)); + sub_8011FC8(data->field_0->arr[0].unk.playerName, ReadAsU16(data->field_0->arr[0].unk.field_0.unk_00.playerTrainerId)); PlaySE(SE_PN_ON); data->state = 4; } @@ -2466,7 +2484,7 @@ void sub_8015664(u32 arg0, const u8 *src) struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; data->state = 8; - data->field_15 = arg0; + data->stateAfterPrint = arg0; if (src != gStringVar4) StringExpandPlaceholders(gStringVar4, src); } @@ -2492,9 +2510,9 @@ void sub_80156C8(struct UnkStruct_URoom *data) void sub_80156E0(u8 taskId) { - u32 var; - s32 var5; - u8 monId = 0; + u32 id = 0; + s32 var5 = 0; + u32 playerGender = 0; struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; s16 *taskData = gTasks[taskId].data; @@ -2508,11 +2526,13 @@ void sub_80156E0(u8 taskId) sub_8017580(data->field_0, 8); gUnknown_02022C2C = 0x40; data->field_20 = sub_8016DF0(data->field_C, data->field_4, 9); + sub_8019BA8(data->field_A0); sub_8019F2C(); data->state = 1; break; case 1: - if (sub_8019E70(data->spriteIds, taskData[0]++) == 8) + sub_8019E70(data->spriteIds, taskData[0]); + if (++taskData[0] == 8) data->state = 2; break; case 2: @@ -2530,18 +2550,18 @@ void sub_80156E0(u8 taskId) case 3: if ((sub_81B1360() == 8 || sub_81B1360() == 9) && gUnknown_02022C40.field_0 != 0) { - monId = GetCursorSelectionMonId(); + id = GetCursorSelectionMonId(); switch (gUnknown_02022C40.field_0) { case 1: sub_8011090(0x54, 0, 1); - if (monId >= PARTY_SIZE) + if (id >= PARTY_SIZE) { sub_801807C(&gUnknown_02022C40); sub_8010FCC(0, 0, 0); sub_801568C(gUnknown_082EF4FC); } - else if (sub_80180A0(GetCursorSelectionMonId(), &gUnknown_02022C40)) + else if (!sub_80180A0(GetCursorSelectionMonId(), &gUnknown_02022C40)) { sub_8015664(0x34, gUnknown_082EF47C); } @@ -2553,7 +2573,7 @@ void sub_80156E0(u8 taskId) case 2: sub_80156C8(data); taskData[1] = gUnknown_02022C40.field_8; - if (monId >= PARTY_SIZE) + if (id >= PARTY_SIZE) { sub_801568C(gUnknown_082EF544); } @@ -2598,9 +2618,9 @@ void sub_80156E0(u8 taskId) gSpecialVar_Result = 0; } } - else if (ScriptContext2_IsEnabled() == TRUE) + else if (ScriptContext2_IsEnabled() != TRUE) { - if (gMain.heldKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { if (sub_801A2A8(data->field_0, &taskData[0], &taskData[1], data->spriteIds)) { @@ -2646,16 +2666,16 @@ void sub_80156E0(u8 taskId) break; case 24: sub_801704C(); - var = sub_8017CF8(taskData[1], data->field_0); + playerGender = sub_8017CF8(taskData[1], data->field_0); sub_8011090(0x54, 0, 1); - switch (sub_80179D4(data->field_0, taskData[0], taskData[1], var)) + switch (sub_80179D4(data->field_0, taskData[0], taskData[1], playerGender)) { case 0: data->state = 26; break; case 1: - sub_8012188(data->field_0->arr[taskData[0]].unk.playerName, &data->field_0->arr[taskData[0]].unk.field_0, gUnknown_02022C2C); - data->field_12 = 0; + sub_8012188(data->field_0->arr[taskData[1]].unk.playerName, &data->field_0->arr[taskData[1]].unk.field_0, gUnknown_02022C2C); + data->field_12 = id; data->state = 25; break; case 2: @@ -2665,8 +2685,7 @@ void sub_80156E0(u8 taskId) break; case 25: sub_801704C(); - var = sub_8011A74(); - switch (var) + switch (sub_8011A74()) { case 4: sub_801818C(TRUE); @@ -2683,7 +2702,7 @@ void sub_80156E0(u8 taskId) break; } - if (gReceivedRemoteLinkPlayers == 0) + if (gReceivedRemoteLinkPlayers != 0) { sub_80143E4(gBlockSendBuffer, TRUE); CreateTask(sub_80140E0, 5); @@ -2691,7 +2710,7 @@ void sub_80156E0(u8 taskId) } break; case 38: - if (FuncIsActiveTask(sub_80140E0)) + if (!FuncIsActiveTask(sub_80140E0)) { if (gUnknown_02022C2C == 0x44) sub_8015664(31, gUnknown_082EE004); @@ -2718,28 +2737,30 @@ void sub_80156E0(u8 taskId) else { data->field_98 = 0; - sub_8017CF8(taskData[1], data->field_0); - if (var5 == -2 || var5 == 0x40) + playerGender = sub_8017CF8(taskData[1], data->field_0); + switch (var5) { + case -2: + case 0x40: data->field_4C[0] = 0x40; sub_800FE50(data->field_4C); StringCopy(gStringVar4, gUnknown_082EEB80[gLinkPlayers[0].gender]); data->state = 32; - } - else - { + break; + default: gUnknown_02022C2C = var5; - gUnknown_02022C2D = var5 >> 8; + gUnknown_02022C2D = (u32)(var5) >> 8; if (gUnknown_02022C2C == 0x41 && !sub_8018024()) { sub_8015664(5, gUnknown_082EEBD0); } else { - gUnknown_02022C2C |= 0x40; - data->field_4C[0] = gUnknown_02022C2C; + data->field_4C[0] = gUnknown_02022C2C | 0x40; + sub_800FE50(data->field_4C); data->state = 27; } + break; } } } @@ -2750,9 +2771,9 @@ void sub_80156E0(u8 taskId) break; case 27: sub_8017FD8(data); - var = sub_8017CF8(taskData[1], data->field_0); - var5 = sub_8017984(data->field_4C[0] & 0x3F); - if (PrintOnTextbox(&data->textState, gUnknown_082EE82C[var5][var])) + playerGender = sub_8017CF8(taskData[1], data->field_0); + id = sub_8017984(data->field_4C[0] & 0x3F); + if (PrintOnTextbox(&data->textState, gUnknown_082EE82C[playerGender][id])) { taskData[3] = 0; data->state = 29; @@ -2764,7 +2785,8 @@ void sub_80156E0(u8 taskId) break; case 31: data->field_4C[0] = 0x44; - data->field_4C[1] = gUnknown_02022C40.level; + data->field_4C[1] = gUnknown_02022C40.species; + data->field_4C[2] = gUnknown_02022C40.level; sub_800FE50(data->field_4C); data->state = 29; break; @@ -2799,9 +2821,9 @@ void sub_80156E0(u8 taskId) break; case 5: case 7: - var5 = sub_80179AC(&data->field_0->arr[taskData[1]]); - var = sub_8017CF8(taskData[1], data->field_0); - sub_8015664(6, gUnknown_082EE24C[var][var5]); + id = sub_80179AC(&data->field_0->arr[taskData[1]]); + playerGender = sub_8017CF8(taskData[1], data->field_0); + sub_8015664(6, gUnknown_082EE24C[id][playerGender]); break; case 40: if (PrintOnTextbox(&data->textState, gStringVar4)) @@ -2818,8 +2840,8 @@ void sub_80156E0(u8 taskId) if (GetMultiplayerId() == 0) { StringCopy(gStringVar1, gLinkPlayers[GetMultiplayerId() ^ 1].name); - var5 = sub_800E540(gLinkPlayers[2].id, gLinkPlayers[2].name); - StringExpandPlaceholders(gStringVar4, gUnknown_082EE378[var5]); + id = sub_800E540(gLinkPlayers[1].trainerId, gLinkPlayers[1].name); + StringExpandPlaceholders(gStringVar4, gUnknown_082EE378[id]); data->state = 33; } else @@ -2829,8 +2851,7 @@ void sub_80156E0(u8 taskId) } break; case 19: - var5 = sub_80170B8(&data->textState, FALSE); - switch (var5) + switch (sub_80170B8(&data->textState, FALSE)) { case 0: CopyBgTilemapBufferToVram(0); @@ -2843,21 +2864,20 @@ void sub_80156E0(u8 taskId) break; case 1: case -1: - var = sub_8017CF8(taskData[1], data->field_0); - sub_801568C(gUnknown_082EEC9C[var]); + playerGender = sub_8017CF8(taskData[1], data->field_0); + sub_801568C(gUnknown_082EEC9C[playerGender]); break; } break; case 20: - if (++taskData[2] >= 60) + if (++taskData[2] > 60) { data->state = 21; taskData[2] = 0; } break; case 21: - var = sub_8011A74(); - switch (var) + switch (sub_8011A74()) { case 4: sub_801818C(TRUE); @@ -2865,12 +2885,12 @@ void sub_80156E0(u8 taskId) break; case 1: case 2: - var = sub_8017CF8(taskData[1], data->field_0); + playerGender = sub_8017CF8(taskData[1], data->field_0); sub_8011090(0x54, 0, 1); if (sub_8011B90() == TRUE) - sub_801568C(gUnknown_082EED3C[var]); + sub_801568C(gUnknown_082EED3C[playerGender]); else - sub_8015664(30, gUnknown_082EED3C[var]); + sub_8015664(30, gUnknown_082EED3C[playerGender]); break; case 3: data->state = 22; @@ -2881,18 +2901,19 @@ void sub_80156E0(u8 taskId) case 22: if (sub_8011A80()) { - var = sub_8017CF8(taskData[1], data->field_0); + playerGender = sub_8017CF8(taskData[1], data->field_0); sub_8011090(0x54, 0, 1); if (sub_8011B90() == TRUE) - sub_801568C(gUnknown_082EED3C[var]); + sub_801568C(gUnknown_082EED3C[playerGender]); else - sub_8015664(30, gUnknown_082EED3C[var]); + sub_8015664(30, gUnknown_082EED3C[playerGender]); } - if (gReceivedRemoteLinkPlayers == 0) + if (gReceivedRemoteLinkPlayers != 0) data->state = 16; break; case 11: PlaySE(SE_PINPON); + sub_800EF7C(); data->state = 12; data->field_9A = 0; break; @@ -2902,7 +2923,7 @@ void sub_80156E0(u8 taskId) sub_801818C(FALSE); data->state = 2; } - else if (gReceivedRemoteLinkPlayers == 0) + else if (gReceivedRemoteLinkPlayers != 0) { sub_80143E4(gBlockSendBuffer, TRUE); CreateTask(sub_80140E0, 5); @@ -2915,8 +2936,8 @@ void sub_80156E0(u8 taskId) { data->state = 33; StringCopy(gStringVar1, gLinkPlayers[1].name); - var5 = sub_800E540(gLinkPlayers[1].id, gLinkPlayers[1].name); - StringExpandPlaceholders(gStringVar4, gUnknown_082EE324[var5]); + id = sub_800E540(gLinkPlayers[1].trainerId, gLinkPlayers[1].name); + StringExpandPlaceholders(gStringVar4, gUnknown_082EE324[id]); } break; case 33: @@ -2926,7 +2947,7 @@ void sub_80156E0(u8 taskId) break; case 34: sub_801689C(data); - if (sub_80168DC(data) && gMain.heldKeys & B_BUTTON) + if (sub_80168DC(data) && gMain.newKeys & B_BUTTON) { sub_8011DE0(1); StringCopy(gStringVar4, gUnknown_082EE598); @@ -2950,7 +2971,7 @@ void sub_80156E0(u8 taskId) taskData[3] = 0; if (gUnknown_02022C2C == 0x41) { - if (sub_8018024()) + if (!sub_8018024()) { data->field_4C[0] = 0x52; sub_800FE50(data->field_4C); @@ -2965,6 +2986,7 @@ void sub_80156E0(u8 taskId) } else if (gUnknown_02022C2C == 0x48) { + sub_800FE50(data->field_4C); sub_8018220(gStringVar4, data, 1); data->state = 40; } @@ -3063,19 +3085,22 @@ void sub_80156E0(u8 taskId) var5 = sub_8017178(&data->textState, &data->field_1D, &data->field_1E, &gUnknown_082F025C, &gUnknown_082F027C); if (var5 != -1) { - switch (var5) + if (var5 == -2 || var5 == 3) { - case -2: - case 3: data->state = 4; sub_801818C(TRUE); - break; - case 1: - sub_8015664(53, gUnknown_082EF4C4); - break; - case 2: - sub_8015664(47, gUnknown_082EF298); - break; + } + else + { + switch (var5) + { + case 1: + sub_8015664(53, gUnknown_082EF4C4); + break; + case 2: + sub_8015664(47, gUnknown_082EF298); + break; + } } } break; @@ -3145,7 +3170,7 @@ void sub_80156E0(u8 taskId) data->state = 48; break; case 48: - var5 = sub_80172A0(&data->textState, &data->field_1D, &data->field_4A, &data->field_1E, &gUnknown_082F0294, &gUnknown_082F032C, data->field_0); + var5 = sub_80172A0(&data->textState, &data->field_1D, &data->field_4A, &data->field_1E, &gUnknown_082F034C, &gUnknown_082F03A4, data->field_0); if (var5 != -1) { switch (var5) @@ -3165,11 +3190,70 @@ void sub_80156E0(u8 taskId) taskData[1] = var5; break; case 1: + sub_8018404(gStringVar1, &data->field_0->arr[var5]); + StringCopy(gStringVar2, gTypeNames[data->field_0->arr[var5].unk.field_0.type]); + sub_8015664(46, gUnknown_082EF6E4); + break; + case 2: + sub_8018404(gStringVar1, &data->field_0->arr[var5]); + StringCopy(gStringVar2, gTypeNames[data->field_0->arr[var5].unk.field_0.type]); + sub_8015664(46, gUnknown_082EF718); break; } break; } } break; + case 49: + switch (sub_80170B8(&data->textState, FALSE)) + { + case 0: + data->state = 50; + break; + case -1: + case 1: + sub_801818C(TRUE); + data->state = 4; + break; + } + break; + case 50: + if (PrintOnTextbox(&data->textState, gUnknown_082EF4C4)) + { + gUnknown_02022C40.field_0 = 2; + memcpy(&gUnknown_02022C38, &data->field_0->arr[taskData[1]].unk.field_0.unk_00, sizeof(gUnknown_02022C38)); + gUnknown_02022C3E = data->field_0->arr[taskData[1]].unk.field_0.type; + gUnknown_02022C3C = data->field_0->arr[taskData[1]].unk.field_0.species; + gFieldCallback = sub_80AF128; + sub_81B8904(9, CB2_ReturnToField); + sub_80156B0(data); + gUnknown_02022C40.field_8 = taskData[1]; + } + break; + case 51: + gUnknown_02022C2C = 0x44; + sub_8012188(data->field_0->arr[taskData[1]].unk.playerName, &data->field_0->arr[taskData[1]].unk.field_0, 0x44); + sub_8018404(gStringVar1, &data->field_0->arr[taskData[1]]); + sub_8017020(gUnknown_082EE17C[2]); + data->state = 25; + break; + case 26: + if (PrintOnTextbox(&data->textState, gStringVar4)) + { + sub_801818C(TRUE); + sub_801A3D0(taskData[0], taskData[1], data->field_0); + data->state = 4; + } + break; + case 8: + if (PrintOnTextbox(&data->textState, gStringVar4)) + data->state = data->stateAfterPrint; + break; } } + +void var_800D_set_xB(void) +{ + if (InUnionRoom() == TRUE) + gSpecialVar_Result = 11; +} -- cgit v1.2.3 From caa36b530a93dc51727822abf6c4c31fa8cbaf63 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Jun 2018 16:48:58 +0200 Subject: label and document battle windows --- asm/battle_frontier_2.s | 16 +- asm/easy_chat.s | 2 +- asm/party_menu.s | 2 +- asm/pokemon_storage_system.s | 4 +- asm/pokemon_summary_screen.s | 4 +- asm/pokenav.s | 6 +- asm/rom_8011DC0.s | 24 +- asm/shop.s | 4 +- asm/slot_machine.s | 4 +- asm/trade.s | 4 +- data/data2b.s | 4 +- include/battle.h | 2 +- include/battle_ai_script_commands.h | 15 +- include/battle_bg.h | 6 +- include/battle_message.h | 2 +- include/battle_util.h | 8 +- include/text_window.h | 8 +- src/battle_ai_script_commands.c | 705 ++++++++++++++---------------- src/battle_ai_switch_items.c | 263 +++++------ src/battle_anim.c | 117 ++--- src/battle_anim_sound_tasks.c | 12 +- src/battle_bg.c | 100 ++--- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 20 +- src/battle_controller_player_partner.c | 2 +- src/battle_controller_recorded_opponent.c | 2 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controller_safari.c | 6 +- src/battle_controller_wally.c | 6 +- src/battle_main.c | 46 +- src/battle_message.c | 688 +++++++++++++++++++++++++---- src/battle_script_commands.c | 10 +- src/berry_blender.c | 12 +- src/clear_save_data_screen.c | 2 +- src/egg_hatch.c | 2 +- src/evolution_scene.c | 30 +- src/field_region_map.c | 2 +- src/hall_of_fame.c | 4 +- src/item_menu.c | 4 +- src/list_menu.c | 2 +- src/main_menu.c | 4 +- src/menu.c | 6 +- src/mystery_event_menu.c | 2 +- src/pokeblock.c | 8 +- src/pokeblock_feed.c | 4 +- src/region_map.c | 2 +- src/reshow_battle_screen.c | 2 +- src/scrcmd.c | 2 +- src/start_menu.c | 2 +- src/starter_choose.c | 4 +- src/text_window.c | 12 +- src/use_pokeblock.c | 2 +- src/wallclock.c | 2 +- 55 files changed, 1363 insertions(+), 847 deletions(-) diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index b2b454278..02bfe8b3b 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -20646,29 +20646,29 @@ _081A5328: ldr r4, =gDisplayedStringBattle adds r0, r4, 0 movs r1, 0xF - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Vs movs r1, 0x10 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_OpponentMon1Name bl BattleStringExpandPlaceholdersToDisplayedString adds r0, r4, 0 movs r1, 0x11 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Mind movs r1, 0x12 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Skill movs r1, 0x13 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Body movs r1, 0x14 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldr r0, =gText_Judgement bl BattleStringExpandPlaceholdersToDisplayedString adds r0, r4, 0 movs r1, 0x15 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow b _081A553E .pool _081A53B4: @@ -20752,7 +20752,7 @@ _081A5464: bl BattleStringExpandPlaceholdersToDisplayedString ldr r0, =gDisplayedStringBattle movs r1, 0x15 - bl BattleHandleAddTextPrinter + bl BattlePutTextOnWindow ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] diff --git a/asm/easy_chat.s b/asm/easy_chat.s index eb423cf4c..a6b522a7e 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC movs r0, 0x1 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0x1 movs r1, 0x1 movs r2, 0xE diff --git a/asm/party_menu.s b/asm/party_menu.s index 4001b7144..6e2b1e55a 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -4396,7 +4396,7 @@ _081B23E8: movs r0, 0 movs r1, 0x4F movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx bl GetOverworldTextboxPalettePtr movs r1, 0xE0 movs r2, 0x20 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 5988eb732..f2b9a5563 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1837,7 +1837,7 @@ _080C805E: movs r0, 0x1 movs r1, 0xB movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx b _080C8198 .pool _080C808C: @@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C movs r0, 0x1 movs r1, 0x2 movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0x20 str r0, [sp] movs r0, 0x14 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index c7f2ad085..901669715 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -5293,11 +5293,11 @@ sub_81C6BD8: @ 81C6BD8 movs r0, 0 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 movs r1, 0xA movs r2, 0xD0 - bl copy_textbox_border_tile_patterns_to_vram + bl LoadMessageBoxGfx ldr r0, =gUnknown_0860F074 movs r1, 0xF0 movs r2, 0x20 diff --git a/asm/pokenav.s b/asm/pokenav.s index 00c8c8448..a9c1ec7e6 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -10101,7 +10101,7 @@ sub_81CC09C: @ 81CC09C ldrb r0, [r4, 0x14] movs r1, 0x1 movs r2, 0x40 - bl sub_809882C + bl LoadSav2WindowGfx ldrb r0, [r4, 0x14] movs r1, 0x1 movs r2, 0x4 @@ -11351,7 +11351,7 @@ sub_81CCA1C: @ 81CCA1C lsrs r0, 24 movs r1, 0x42 movs r2, 0x40 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldrb r0, [r5, 0x8] movs r1, 0x42 movs r2, 0x4 @@ -22282,7 +22282,7 @@ sub_81D2824: @ 81D2824 movs r0, 0 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx ldr r0, =gUnknown_0860F074 movs r1, 0xF0 movs r2, 0x20 diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index f906304ca..b43978f84 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -10972,11 +10972,11 @@ _08018574: movs r0, 0 movs r1, 0xA movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 movs r1, 0x1 movs r2, 0xF0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ movs r4, 0x20 str r4, [sp] str r4, [sp, 0x4] @@ -15907,11 +15907,11 @@ _0801AD8C: movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ bl sub_819789C ldr r0, =sub_801AC40 bl SetVBlankCallback @@ -27081,11 +27081,11 @@ sub_8020740: @ 8020740 movs r0, 0x3 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0x3 movs r1, 0xA movs r2, 0x20 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldr r0, =gUnknown_0860F074 movs r1, 0xE0 movs r2, 0x20 @@ -30171,7 +30171,7 @@ _0802210C: ldr r4, =0x0000021d adds r1, r4, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldrb r0, [r5] movs r1, 0 adds r2, r4, 0 @@ -30370,7 +30370,7 @@ _08022296: ldr r4, =0x0000021d adds r1, r4, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldrb r0, [r6, 0x2] movs r1, 0 adds r2, r4, 0 @@ -35221,7 +35221,7 @@ sub_80248B0: @ 80248B0 ldr r5, =0x0000021d adds r1, r5, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ ldrb r4, [r4] bl sub_80247BC adds r3, r0, 0 @@ -41645,7 +41645,7 @@ sub_8027BEC: @ 8027BEC adds r0, r7, 0 adds r1, r4, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ adds r0, r7, 0 adds r1, r4, 0 movs r2, 0xD @@ -44214,7 +44214,7 @@ sub_802902C: @ 802902C movs r0, 0 movs r1, 0xA movs r2, 0xB0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ pop {r0} bx r0 thumb_func_end sub_802902C @@ -54638,7 +54638,7 @@ sub_802E500: @ 802E500 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ adds r0, r4, 0 adds r1, r5, 0 movs r2, 0xD diff --git a/asm/shop.s b/asm/shop.s index b498da70d..515174151 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -1157,11 +1157,11 @@ BuyMenuInitWindows: @ 80E0468 movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 movs r1, 0xA movs r2, 0xE0 - bl copy_textbox_border_tile_patterns_to_vram + bl LoadMessageBoxGfx movs r0, 0 bl PutWindowTilemap movs r0, 0x1 diff --git a/asm/slot_machine.s b/asm/slot_machine.s index fc475c2e3..1719833a5 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -634,12 +634,12 @@ sub_812AA48: @ 812AA48 lsls r1, 2 movs r0, 0 movs r2, 0xF0 - bl copy_textbox_border_tile_patterns_to_vram + bl LoadMessageBoxGfx movs r1, 0x85 lsls r1, 2 movs r0, 0 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx movs r0, 0 bl PutWindowTilemap pop {r0} diff --git a/asm/trade.s b/asm/trade.s index b96fb8ca9..0d7353938 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -241,11 +241,11 @@ _08077310: movs r0, 0 movs r1, 0x14 movs r2, 0xC0 - bl box_border_load_tiles_and_pal + bl LoadSav2WindowGfx_ movs r0, 0x2 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadSav2WindowGfx bl LoadMonIconPalettes ldr r2, =gUnknown_0203229C ldr r0, [r2] diff --git a/data/data2b.s b/data/data2b.s index 8d759b0b2..17a44ecbc 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4684,7 +4684,7 @@ gUnknown_0831AA00:: @ 831AA00 obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710 .align 2 -gUnknown_0831AA08:: @ 831AA08 +gBattleBgTemplates:: @ 831AA08 .4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab .align 2 @@ -4743,7 +4743,7 @@ gUnknown_0831AAE0:: @ 831AAE0 null_window_template .align 2 -gUnknown_0831ABA0:: @ 831ABA0 +gBattleWindowTemplates:: @ 831ABA0 .4byte gUnknown_0831AA18 .4byte gUnknown_0831AAE0 diff --git a/include/battle.h b/include/battle.h index ae8a1c98a..bf875ad9d 100644 --- a/include/battle.h +++ b/include/battle.h @@ -606,7 +606,7 @@ struct BattleScripting u8 reshowMainState; u8 reshowHelperState; u8 field_23; - u8 field_24; + u8 windowsType; // 0 - normal, 1 - battle arena u8 multiplayerId; }; diff --git a/include/battle_ai_script_commands.h b/include/battle_ai_script_commands.h index 316f76de6..d23ad048a 100644 --- a/include/battle_ai_script_commands.h +++ b/include/battle_ai_script_commands.h @@ -1,13 +1,18 @@ #ifndef GUARD_BATTLE_AI_SCRIPT_COMMANDS_H #define GUARD_BATTLE_AI_SCRIPT_COMMANDS_H +// return values for BattleAI_ChooseMoveOrAction +// 0 - 3 are move idx +#define AI_CHOICE_FLEE 4 +#define AI_CHOICE_WATCH 5 + void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves); void BattleAI_SetupAIData(u8 defaultScoreMoves); u8 BattleAI_ChooseMoveOrAction(void); -void ClearBattlerMoveHistory(u8 bank); -void RecordAbilityBattle(u8 bank, u8 abilityId); -void ClearBattlerAbilityHistory(u8 bank); -void RecordItemEffectBattle(u8 bank, u8 itemEffect); -void ClearBankItemEffectHistory(u8 bank); +void ClearBattlerMoveHistory(u8 battlerId); +void RecordAbilityBattle(u8 battlerId, u8 abilityId); +void ClearBattlerAbilityHistory(u8 battlerId); +void RecordItemEffectBattle(u8 battlerId, u8 itemEffect); +void ClearBattlerItemEffectHistory(u8 battlerId); #endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H diff --git a/include/battle_bg.h b/include/battle_bg.h index 7fc09fbf7..dac41c992 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -1,13 +1,13 @@ #ifndef GUARD_BATTLE_BG_H #define GUARD_BATTLE_BG_H -void sub_8035658(void); +void BattleInitBgsAndWindows(void); void sub_80356D0(void); -void ApplyPlayerChosenFrameToBattleMenu(void); +void LoadBattleMenuWindowGfx(void); void DrawMainBattleBackground(void); void LoadBattleTextboxAndBackground(void); void sub_8035D74(u8 taskId); -void LoadBattleEntryBackground(void); +void DrawBattleEntryBackground(void); bool8 LoadChosenBattleElement(u8 caseId); #endif // GUARD_BATTLE_BG_H diff --git a/include/battle_message.h b/include/battle_message.h index bf9b590af..f792ff7b0 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -212,7 +212,7 @@ struct StringInfoBattle void BufferStringBattle(u16 stringID); u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src); u32 BattleStringExpandPlaceholders(const u8* src, u8* dst); -void BattleHandleAddTextPrinter(const u8* text, u8 arg1); +void BattlePutTextOnWindow(const u8* text, u8 arg1); void SetPpNumbersPaletteInMoveSelection(void); u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp); diff --git a/include/battle_util.h b/include/battle_util.h index e5c1aaf18..0b5590011 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -30,10 +30,14 @@ #define ABILITYEFFECT_CHECK_ON_FIELD 0x13 #define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF +#define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0)) +#define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0)) +#define ABILITY_ON_FIELD2(abilityId)(AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, abilityId, 0, 0)) + #define ITEMEFFECT_ON_SWITCH_IN 0x0 -#define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0))) -#define WEATHER_HAS_EFFECT2 ((!AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_AIR_LOCK, 0, 0))) +#define WEATHER_HAS_EFFECT ((!ABILITY_ON_FIELD(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD(ABILITY_AIR_LOCK))) +#define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK))) #define BS_GET_TARGET 0 #define BS_GET_ATTACKER 1 diff --git a/include/text_window.h b/include/text_window.h index 2ac13fab7..3d2b8692f 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -13,10 +13,10 @@ extern const u8 gTextWindowFrame1_Gfx[]; extern const u16 gTextWindowFrame1_Pal[]; const struct TilesPal* GetWindowFrameTilesPal(u8 id); -void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset); -void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset); -void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset); -void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset); +void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset); +void LoadSav2WindowGfx(u8 windowId, u16 destOffset, u8 palOffset); +void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset); +void LoadSav2WindowGfx_(u8 windowId, u16 destOffset, u8 palOffset); void sub_8098858(u8 windowId, u16 tileNum, u8 palNum); void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum); void rbox_fill_rectangle(u8 windowId); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index e1a9168a9..131598985 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -3,6 +3,7 @@ #include "pokemon.h" #include "battle.h" #include "battle_setup.h" +#include "recorded_battle.h" #include "constants/species.h" #include "constants/abilities.h" #include "random.h" @@ -41,13 +42,12 @@ in order to read the next command correctly. refer to battle_ai_scripts.s for th AI scripts. */ -extern const u8 * const gBattleAI_ScriptsTable[]; +extern const u8 *const gBattleAI_ScriptsTable[]; -extern u32 GetAiScriptsInRecordedBattle(); extern u32 GetAiScriptsInBattleFactory(); -static u8 BattleAI_ChooseMoveOrAction_Singles(void); -static u8 BattleAI_ChooseMoveOrAction_Doubles(void); +static u8 ChooseMoveOrAction_Singles(void); +static u8 ChooseMoveOrAction_Doubles(void); static void RecordLastUsedMoveByTarget(void); static void BattleAI_DoAIProcessing(void); static void AIStackPushVar(const u8 *); @@ -90,7 +90,7 @@ static void BattleAICmd_get_turn_count(void); static void BattleAICmd_get_type(void); static void BattleAICmd_get_considered_move_power(void); static void BattleAICmd_get_how_powerful_move_is(void); -static void BattleAICmd_get_last_used_bank_move(void); +static void BattleAICmd_get_last_used_battler_move(void); static void BattleAICmd_if_equal_(void); static void BattleAICmd_if_not_equal_(void); static void BattleAICmd_if_user_goes(void); @@ -154,115 +154,113 @@ static void BattleAICmd_if_flash_fired(void); static void BattleAICmd_if_holds_item(void); // ewram - EWRAM_DATA const u8 *gAIScriptPtr = NULL; EWRAM_DATA static u8 sBattler_AI = 0; // const rom data - typedef void (*BattleAICmdFunc)(void); static const BattleAICmdFunc sBattleAICmdTable[] = { - BattleAICmd_if_random_less_than, // 0x0 - BattleAICmd_if_random_greater_than, // 0x1 - BattleAICmd_if_random_equal, // 0x2 - BattleAICmd_if_random_not_equal, // 0x3 - BattleAICmd_score, // 0x4 - BattleAICmd_if_hp_less_than, // 0x5 - BattleAICmd_if_hp_more_than, // 0x6 - BattleAICmd_if_hp_equal, // 0x7 - BattleAICmd_if_hp_not_equal, // 0x8 - BattleAICmd_if_status, // 0x9 - BattleAICmd_if_not_status, // 0xA - BattleAICmd_if_status2, // 0xB - BattleAICmd_if_not_status2, // 0xC - BattleAICmd_if_status3, // 0xD - BattleAICmd_if_not_status3, // 0xE - BattleAICmd_if_side_affecting, // 0xF - BattleAICmd_if_not_side_affecting, // 0x10 - BattleAICmd_if_less_than, // 0x11 - BattleAICmd_if_more_than, // 0x12 - BattleAICmd_if_equal, // 0x13 - BattleAICmd_if_not_equal, // 0x14 - BattleAICmd_if_less_than_ptr, // 0x15 - BattleAICmd_if_more_than_ptr, // 0x16 - BattleAICmd_if_equal_ptr, // 0x17 - BattleAICmd_if_not_equal_ptr, // 0x18 - BattleAICmd_if_move, // 0x19 - BattleAICmd_if_not_move, // 0x1A - BattleAICmd_if_in_bytes, // 0x1B - BattleAICmd_if_not_in_bytes, // 0x1C - BattleAICmd_if_in_hwords, // 0x1D - BattleAICmd_if_not_in_hwords, // 0x1E - BattleAICmd_if_user_has_attacking_move, // 0x1F - BattleAICmd_if_user_has_no_attacking_moves, // 0x20 - BattleAICmd_get_turn_count, // 0x21 - BattleAICmd_get_type, // 0x22 - BattleAICmd_get_considered_move_power, // 0x23 - BattleAICmd_get_how_powerful_move_is, // 0x24 - BattleAICmd_get_last_used_bank_move, // 0x25 - BattleAICmd_if_equal_, // 0x26 - BattleAICmd_if_not_equal_, // 0x27 - BattleAICmd_if_user_goes, // 0x28 - BattleAICmd_if_user_doesnt_go, // 0x29 - BattleAICmd_nullsub_2A, // 0x2A - BattleAICmd_nullsub_2B, // 0x2B - BattleAICmd_count_usable_party_mons, // 0x2C - BattleAICmd_get_considered_move, // 0x2D - BattleAICmd_get_considered_move_effect, // 0x2E - BattleAICmd_get_ability, // 0x2F - BattleAICmd_get_highest_type_effectiveness, // 0x30 - BattleAICmd_if_type_effectiveness, // 0x31 - BattleAICmd_nullsub_32, // 0x32 - BattleAICmd_nullsub_33, // 0x33 - BattleAICmd_if_status_in_party, // 0x34 - BattleAICmd_if_status_not_in_party, // 0x35 - BattleAICmd_get_weather, // 0x36 - BattleAICmd_if_effect, // 0x37 - BattleAICmd_if_not_effect, // 0x38 - BattleAICmd_if_stat_level_less_than, // 0x39 - BattleAICmd_if_stat_level_more_than, // 0x3A - BattleAICmd_if_stat_level_equal, // 0x3B - BattleAICmd_if_stat_level_not_equal, // 0x3C - BattleAICmd_if_can_faint, // 0x3D - BattleAICmd_if_cant_faint, // 0x3E - BattleAICmd_if_has_move, // 0x3F - BattleAICmd_if_doesnt_have_move, // 0x40 - BattleAICmd_if_has_move_with_effect, // 0x41 - BattleAICmd_if_doesnt_have_move_with_effect, // 0x42 + BattleAICmd_if_random_less_than, // 0x0 + BattleAICmd_if_random_greater_than, // 0x1 + BattleAICmd_if_random_equal, // 0x2 + BattleAICmd_if_random_not_equal, // 0x3 + BattleAICmd_score, // 0x4 + BattleAICmd_if_hp_less_than, // 0x5 + BattleAICmd_if_hp_more_than, // 0x6 + BattleAICmd_if_hp_equal, // 0x7 + BattleAICmd_if_hp_not_equal, // 0x8 + BattleAICmd_if_status, // 0x9 + BattleAICmd_if_not_status, // 0xA + BattleAICmd_if_status2, // 0xB + BattleAICmd_if_not_status2, // 0xC + BattleAICmd_if_status3, // 0xD + BattleAICmd_if_not_status3, // 0xE + BattleAICmd_if_side_affecting, // 0xF + BattleAICmd_if_not_side_affecting, // 0x10 + BattleAICmd_if_less_than, // 0x11 + BattleAICmd_if_more_than, // 0x12 + BattleAICmd_if_equal, // 0x13 + BattleAICmd_if_not_equal, // 0x14 + BattleAICmd_if_less_than_ptr, // 0x15 + BattleAICmd_if_more_than_ptr, // 0x16 + BattleAICmd_if_equal_ptr, // 0x17 + BattleAICmd_if_not_equal_ptr, // 0x18 + BattleAICmd_if_move, // 0x19 + BattleAICmd_if_not_move, // 0x1A + BattleAICmd_if_in_bytes, // 0x1B + BattleAICmd_if_not_in_bytes, // 0x1C + BattleAICmd_if_in_hwords, // 0x1D + BattleAICmd_if_not_in_hwords, // 0x1E + BattleAICmd_if_user_has_attacking_move, // 0x1F + BattleAICmd_if_user_has_no_attacking_moves, // 0x20 + BattleAICmd_get_turn_count, // 0x21 + BattleAICmd_get_type, // 0x22 + BattleAICmd_get_considered_move_power, // 0x23 + BattleAICmd_get_how_powerful_move_is, // 0x24 + BattleAICmd_get_last_used_battler_move, // 0x25 + BattleAICmd_if_equal_, // 0x26 + BattleAICmd_if_not_equal_, // 0x27 + BattleAICmd_if_user_goes, // 0x28 + BattleAICmd_if_user_doesnt_go, // 0x29 + BattleAICmd_nullsub_2A, // 0x2A + BattleAICmd_nullsub_2B, // 0x2B + BattleAICmd_count_usable_party_mons, // 0x2C + BattleAICmd_get_considered_move, // 0x2D + BattleAICmd_get_considered_move_effect, // 0x2E + BattleAICmd_get_ability, // 0x2F + BattleAICmd_get_highest_type_effectiveness, // 0x30 + BattleAICmd_if_type_effectiveness, // 0x31 + BattleAICmd_nullsub_32, // 0x32 + BattleAICmd_nullsub_33, // 0x33 + BattleAICmd_if_status_in_party, // 0x34 + BattleAICmd_if_status_not_in_party, // 0x35 + BattleAICmd_get_weather, // 0x36 + BattleAICmd_if_effect, // 0x37 + BattleAICmd_if_not_effect, // 0x38 + BattleAICmd_if_stat_level_less_than, // 0x39 + BattleAICmd_if_stat_level_more_than, // 0x3A + BattleAICmd_if_stat_level_equal, // 0x3B + BattleAICmd_if_stat_level_not_equal, // 0x3C + BattleAICmd_if_can_faint, // 0x3D + BattleAICmd_if_cant_faint, // 0x3E + BattleAICmd_if_has_move, // 0x3F + BattleAICmd_if_doesnt_have_move, // 0x40 + BattleAICmd_if_has_move_with_effect, // 0x41 + BattleAICmd_if_doesnt_have_move_with_effect, // 0x42 BattleAICmd_if_any_move_disabled_or_encored, // 0x43 BattleAICmd_if_curr_move_disabled_or_encored, // 0x44 - BattleAICmd_flee, // 0x45 - BattleAICmd_if_random_safari_flee, // 0x46 - BattleAICmd_watch, // 0x47 - BattleAICmd_get_hold_effect, // 0x48 - BattleAICmd_get_gender, // 0x49 - BattleAICmd_is_first_turn_for, // 0x4A - BattleAICmd_get_stockpile_count, // 0x4B - BattleAICmd_is_double_battle, // 0x4C - BattleAICmd_get_used_held_item, // 0x4D - BattleAICmd_get_move_type_from_result, // 0x4E - BattleAICmd_get_move_power_from_result, // 0x4F - BattleAICmd_get_move_effect_from_result, // 0x50 - BattleAICmd_get_protect_count, // 0x51 - BattleAICmd_nullsub_52, // 0x52 - BattleAICmd_nullsub_53, // 0x53 - BattleAICmd_nullsub_54, // 0x54 - BattleAICmd_nullsub_55, // 0x55 - BattleAICmd_nullsub_56, // 0x56 - BattleAICmd_nullsub_57, // 0x57 - BattleAICmd_call, // 0x58 - BattleAICmd_goto, // 0x59 - BattleAICmd_end, // 0x5A - BattleAICmd_if_level_cond, // 0x5B - BattleAICmd_if_target_taunted, // 0x5C - BattleAICmd_if_target_not_taunted, // 0x5D - BattleAICmd_if_target_is_ally, // 0x5E - BattleAICmd_is_of_type, // 0x5F - BattleAICmd_check_ability, // 0x60 - BattleAICmd_if_flash_fired, // 0x61 - BattleAICmd_if_holds_item, // 0x62 + BattleAICmd_flee, // 0x45 + BattleAICmd_if_random_safari_flee, // 0x46 + BattleAICmd_watch, // 0x47 + BattleAICmd_get_hold_effect, // 0x48 + BattleAICmd_get_gender, // 0x49 + BattleAICmd_is_first_turn_for, // 0x4A + BattleAICmd_get_stockpile_count, // 0x4B + BattleAICmd_is_double_battle, // 0x4C + BattleAICmd_get_used_held_item, // 0x4D + BattleAICmd_get_move_type_from_result, // 0x4E + BattleAICmd_get_move_power_from_result, // 0x4F + BattleAICmd_get_move_effect_from_result, // 0x50 + BattleAICmd_get_protect_count, // 0x51 + BattleAICmd_nullsub_52, // 0x52 + BattleAICmd_nullsub_53, // 0x53 + BattleAICmd_nullsub_54, // 0x54 + BattleAICmd_nullsub_55, // 0x55 + BattleAICmd_nullsub_56, // 0x56 + BattleAICmd_nullsub_57, // 0x57 + BattleAICmd_call, // 0x58 + BattleAICmd_goto, // 0x59 + BattleAICmd_end, // 0x5A + BattleAICmd_if_level_cond, // 0x5B + BattleAICmd_if_target_taunted, // 0x5C + BattleAICmd_if_target_not_taunted, // 0x5D + BattleAICmd_if_target_is_ally, // 0x5E + BattleAICmd_is_of_type, // 0x5F + BattleAICmd_check_ability, // 0x60 + BattleAICmd_if_flash_fired, // 0x61 + BattleAICmd_if_holds_item, // 0x62 }; static const u16 sDiscouragedPowerfulMoveEffects[] = @@ -282,26 +280,29 @@ static const u16 sDiscouragedPowerfulMoveEffects[] = 0xFFFF }; +// code void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves) { s32 i; - u8 *data = (u8 *)gBattleResources->battleHistory; + u8 *data = (u8 *)BATTLE_HISTORY; for (i = 0; i < sizeof(struct BattleHistory); i++) data[i] = 0; - // items are allowed to use in ONLY trainer battles - if ((gBattleTypeFlags & - (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_BATTLE_TOWER | - BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_TRAINER | BATTLE_TYPE_FRONTIER - | BATTLE_TYPE_INGAME_PARTNER | BATTLE_TYPE_x2000000 | BATTLE_TYPE_SECRET_BASE)) - == BATTLE_TYPE_TRAINER) + + // Items are allowed to use in ONLY trainer battles. + if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) + && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_SECRET_BASE | BATTLE_TYPE_FRONTIER + | BATTLE_TYPE_INGAME_PARTNER | BATTLE_TYPE_x2000000) + ) + ) { for (i = 0; i < 4; i++) { if (gTrainers[gTrainerBattleOpponent_A].items[i] != 0) { - gBattleResources->battleHistory->trainerItems[gBattleResources->battleHistory->itemsNo] = gTrainers[gTrainerBattleOpponent_A].items[i]; - gBattleResources->battleHistory->itemsNo++; + BATTLE_HISTORY->trainerItems[BATTLE_HISTORY->itemsNo] = gTrainers[gTrainerBattleOpponent_A].items[i]; + BATTLE_HISTORY->itemsNo++; } } } @@ -315,23 +316,24 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves) u8 *data = (u8 *)AI_THINKING_STRUCT; u8 moveLimitations; - // clear AI data. + // Clear AI data. for (i = 0; i < sizeof(struct AI_ThinkingStruct); i++) data[i] = 0; - // conditional score reset, unlike Ruby. + // Conditional score reset, unlike Ruby. for (i = 0; i < 4; i++) { if (defaultScoreMoves & 1) AI_THINKING_STRUCT->score[i] = 100; else AI_THINKING_STRUCT->score[i] = 0; + defaultScoreMoves >>= 1; } moveLimitations = CheckMoveLimitations(gActiveBattler, 0, 0xFF); - // ignore moves that aren't possible to use + // Ignore moves that aren't possible to use. for (i = 0; i < 4; i++) { if (gBitTable[i] & moveLimitations) @@ -339,21 +341,24 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves) AI_THINKING_STRUCT->simulatedRNG[i] = 100 - (Random() % 16); } + gBattleResources->AI_ScriptsStack->size = 0; sBattler_AI = gActiveBattler; - // decide a random target battlerId in doubles + + // Decide a random target battlerId in doubles. if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { gBattlerTarget = (Random() & BIT_FLANK) + (GetBattlerSide(gActiveBattler) ^ BIT_SIDE); if (gAbsentBattlerFlags & gBitTable[gBattlerTarget]) gBattlerTarget ^= BIT_FLANK; } - // in singles there's only one choice + // There's only one choice in signle battles. else { gBattlerTarget = sBattler_AI ^ BIT_SIDE; } + // Choose proper trainer ai scripts. if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) AI_THINKING_STRUCT->aiFlags = GetAiScriptsInRecordedBattle(); else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) @@ -370,6 +375,7 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves) AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent_A].aiFlags | gTrainers[gTrainerBattleOpponent_B].aiFlags; else AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent_A].aiFlags; + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) AI_THINKING_STRUCT->aiFlags |= AI_SCRIPT_DOUBLE_BATTLE; // act smart in doubles and don't attack your partner } @@ -380,15 +386,15 @@ u8 BattleAI_ChooseMoveOrAction(void) u8 ret; if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) - ret = BattleAI_ChooseMoveOrAction_Singles(); + ret = ChooseMoveOrAction_Singles(); else - ret = BattleAI_ChooseMoveOrAction_Doubles(); + ret = ChooseMoveOrAction_Doubles(); gCurrentMove = savedCurrentMove; return ret; } -static u8 BattleAI_ChooseMoveOrAction_Singles(void) +static u8 ChooseMoveOrAction_Singles(void) { u8 currentMoveArray[4]; u8 consideredMoveArray[4]; @@ -409,11 +415,11 @@ static u8 BattleAI_ChooseMoveOrAction_Singles(void) AI_THINKING_STRUCT->movesetIndex = 0; } - // special flags for safari + // Check special AI actions. if (AI_THINKING_STRUCT->aiAction & AI_ACTION_FLEE) - return 4; + return AI_CHOICE_FLEE; if (AI_THINKING_STRUCT->aiAction & AI_ACTION_WATCH) - return 5; + return AI_CHOICE_WATCH; numOfBestMoves = 1; currentMoveArray[0] = AI_THINKING_STRUCT->score[0]; @@ -421,9 +427,9 @@ static u8 BattleAI_ChooseMoveOrAction_Singles(void) for (i = 1; i < 4; i++) { - if (gBattleMons[sBattler_AI].moves[i] != 0) // emerald adds an extra move ID check for some reason. + if (gBattleMons[sBattler_AI].moves[i] != MOVE_NONE) { - // in ruby, the order of these if statements are reversed. + // In ruby, the order of these if statements is reversed. if (currentMoveArray[0] == AI_THINKING_STRUCT->score[i]) { currentMoveArray[numOfBestMoves] = AI_THINKING_STRUCT->score[i]; @@ -440,7 +446,7 @@ static u8 BattleAI_ChooseMoveOrAction_Singles(void) return consideredMoveArray[Random() % numOfBestMoves]; } -static u8 BattleAI_ChooseMoveOrAction_Doubles(void) +static u8 ChooseMoveOrAction_Doubles(void) { s32 i; s32 j; @@ -487,10 +493,15 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void) AI_THINKING_STRUCT->aiLogicId++; AI_THINKING_STRUCT->movesetIndex = 0; } + if (AI_THINKING_STRUCT->aiAction & AI_ACTION_FLEE) - actionOrMoveIndex[i] = 4; + { + actionOrMoveIndex[i] = AI_CHOICE_FLEE; + } else if (AI_THINKING_STRUCT->aiAction & AI_ACTION_WATCH) - actionOrMoveIndex[i] = 5; + { + actionOrMoveIndex[i] = AI_CHOICE_WATCH; + } else { mostViableMovesScores[0] = AI_THINKING_STRUCT->score[0]; @@ -513,18 +524,16 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void) mostViableMovesNo = 1; } } - //_08130E72 } actionOrMoveIndex[i] = mostViableMovesIndices[Random() % mostViableMovesNo]; bestMovePointsForTarget[i] = mostViableMovesScores[0]; - // don't use a move against ally if it has less than 100 pts + // Don't use a move against ally if it has less than 100 points. if (i == (sBattler_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100) { bestMovePointsForTarget[i] = -1; - mostViableMovesScores[0] = mostViableMovesScores[0]; // needed to match + mostViableMovesScores[0] = mostViableMovesScores[0]; // Needed to match. } - } } } @@ -535,13 +544,11 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void) for (i = 1; i < 4; i++) { - //_08130EDA if (mostMovePoints == bestMovePointsForTarget[i]) { mostViableTargetsArray[mostViableTargetsNo] = i; mostViableTargetsNo++; } - //_08130EEE if (mostMovePoints < bestMovePointsForTarget[i]) { mostMovePoints = bestMovePointsForTarget[i]; @@ -576,7 +583,9 @@ static void BattleAI_DoAIProcessing(void) break; case AIState_Processing: if (AI_THINKING_STRUCT->moveConsidered != 0) + { sBattleAICmdTable[*gAIScriptPtr](); // Run AI command. + } else { AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] = 0; @@ -604,12 +613,12 @@ static void RecordLastUsedMoveByTarget(void) for (i = 0; i < 4; i++) { - if (gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget]) + if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget]) break; - if (gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] != gLastMoves[gBattlerTarget] // HACK: This redundant condition is a hack to make the asm match. - && gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] == 0) + if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] != gLastMoves[gBattlerTarget] // HACK: This redundant condition is a hack to make the asm match. + && BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == MOVE_NONE) { - gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] = gLastMoves[gBattlerTarget]; + BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] = gLastMoves[gBattlerTarget]; break; } } @@ -620,27 +629,27 @@ void ClearBattlerMoveHistory(u8 battlerId) s32 i; for (i = 0; i < 4; i++) - gBattleResources->battleHistory->usedMoves[battlerId].moves[i] = 0; + BATTLE_HISTORY->usedMoves[battlerId].moves[i] = MOVE_NONE; } void RecordAbilityBattle(u8 battlerId, u8 abilityId) { - gBattleResources->battleHistory->abilities[battlerId] = abilityId; + BATTLE_HISTORY->abilities[battlerId] = abilityId; } void ClearBattlerAbilityHistory(u8 battlerId) { - gBattleResources->battleHistory->abilities[battlerId] = 0; + BATTLE_HISTORY->abilities[battlerId] = ABILITY_NONE; } void RecordItemEffectBattle(u8 battlerId, u8 itemEffect) { - gBattleResources->battleHistory->itemEffects[battlerId] = itemEffect; + BATTLE_HISTORY->itemEffects[battlerId] = itemEffect; } -void ClearBankItemEffectHistory(u8 battlerId) +void ClearBattlerItemEffectHistory(u8 battlerId) { - gBattleResources->battleHistory->itemEffects[battlerId] = 0; + BATTLE_HISTORY->itemEffects[battlerId] = 0; } static void BattleAICmd_if_random_less_than(void) @@ -685,9 +694,9 @@ static void BattleAICmd_if_random_not_equal(void) static void BattleAICmd_score(void) { - AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] += gAIScriptPtr[1]; // add the result to the array of the move consider's score. + AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] += gAIScriptPtr[1]; // Add the result to the array of the move consider's score. - if (AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] < 0) // if the score is negative, flatten it to 0. + if (AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] < 0) // If the score is negative, flatten it to 0. AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] = 0; gAIScriptPtr += 2; // AI return. @@ -765,7 +774,7 @@ static void BattleAICmd_if_status(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status1 & status) != 0) + if ((gBattleMons[battlerId].status1 & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -783,7 +792,7 @@ static void BattleAICmd_if_not_status(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status1 & status) == 0) + if (!(gBattleMons[battlerId].status1 & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -801,7 +810,7 @@ static void BattleAICmd_if_status2(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status2 & status) != 0) + if ((gBattleMons[battlerId].status2 & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -819,7 +828,7 @@ static void BattleAICmd_if_not_status2(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status2 & status) == 0) + if (!(gBattleMons[battlerId].status2 & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -837,7 +846,7 @@ static void BattleAICmd_if_status3(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gStatuses3[battlerId] & status) != 0) + if ((gStatuses3[battlerId] & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -855,7 +864,7 @@ static void BattleAICmd_if_not_status3(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gStatuses3[battlerId] & status) == 0) + if (!(gStatuses3[battlerId] & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -874,7 +883,7 @@ static void BattleAICmd_if_side_affecting(void) side = GET_BATTLER_SIDE(battlerId); status = T1_READ_32(gAIScriptPtr + 2); - if ((gSideStatuses[side] & status) != 0) + if ((gSideStatuses[side] & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -893,7 +902,7 @@ static void BattleAICmd_if_not_side_affecting(void) side = GET_BATTLER_SIDE(battlerId); status = T1_READ_32(gAIScriptPtr + 2); - if ((gSideStatuses[side] & status) == 0) + if (!(gSideStatuses[side] & status)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -1041,7 +1050,7 @@ static void BattleAICmd_if_in_hwords(void) static void BattleAICmd_if_not_in_hwords(void) { - const u16 *ptr = (u16 *)T1_READ_PTR(gAIScriptPtr + 1); + const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); while (*ptr != 0xFFFF) { @@ -1065,6 +1074,7 @@ static void BattleAICmd_if_user_has_attacking_move(void) && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0) break; } + if (i == 4) gAIScriptPtr += 5; else @@ -1081,6 +1091,7 @@ static void BattleAICmd_if_user_has_no_attacking_moves(void) && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0) break; } + if (i != 4) gAIScriptPtr += 5; else @@ -1118,34 +1129,30 @@ static void BattleAICmd_get_type(void) gAIScriptPtr += 2; } -static u8 BattleAI_GetWantedBank(u8 battlerId) +static u8 BattleAI_GetWantedBattler(u8 wantedBattler) { - switch (battlerId) + switch (wantedBattler) { - case AI_USER: - return sBattler_AI; - case AI_TARGET: - default: - return gBattlerTarget; - case AI_USER_PARTNER: - return sBattler_AI ^ BIT_FLANK; - case AI_TARGET_PARTNER: - return gBattlerTarget ^ BIT_FLANK; + case AI_USER: + return sBattler_AI; + case AI_TARGET: + default: + return gBattlerTarget; + case AI_USER_PARTNER: + return sBattler_AI ^ BIT_FLANK; + case AI_TARGET_PARTNER: + return gBattlerTarget ^ BIT_FLANK; } } static void BattleAICmd_is_of_type(void) { - u8 battlerId = BattleAI_GetWantedBank(gAIScriptPtr[1]); + u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); - if(gBattleMons[battlerId].type1 == gAIScriptPtr[2] || gBattleMons[battlerId].type2 == gAIScriptPtr[2]) - { + if (IS_BATTLER_OF_TYPE(battlerId, gAIScriptPtr[2])) AI_THINKING_STRUCT->funcResult = TRUE; - } else - { AI_THINKING_STRUCT->funcResult = FALSE; - } gAIScriptPtr += 3; } @@ -1208,19 +1215,19 @@ static void BattleAICmd_get_how_powerful_move_is(void) } if (checkedMove == 4) - AI_THINKING_STRUCT->funcResult = MOVE_MOST_POWERFUL; // is the most powerful + AI_THINKING_STRUCT->funcResult = MOVE_MOST_POWERFUL; // Is the most powerful. else - AI_THINKING_STRUCT->funcResult = MOVE_NOT_MOST_POWERFUL; // not most powerful + AI_THINKING_STRUCT->funcResult = MOVE_NOT_MOST_POWERFUL; // Not the most powerful. } else { - AI_THINKING_STRUCT->funcResult = MOVE_POWER_DISCOURAGED; // highly discouraged in terms of power + AI_THINKING_STRUCT->funcResult = MOVE_POWER_DISCOURAGED; // Highly discouraged in terms of power. } gAIScriptPtr++; } -static void BattleAICmd_get_last_used_bank_move(void) +static void BattleAICmd_get_last_used_battler_move(void) { if (gAIScriptPtr[1] == AI_USER) AI_THINKING_STRUCT->funcResult = gLastMoves[sBattler_AI]; @@ -1230,7 +1237,7 @@ static void BattleAICmd_get_last_used_bank_move(void) gAIScriptPtr += 2; } -static void BattleAICmd_if_equal_(void) // same as if_equal +static void BattleAICmd_if_equal_(void) // Same as if_equal. { if (gAIScriptPtr[1] == AI_THINKING_STRUCT->funcResult) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); @@ -1238,7 +1245,7 @@ static void BattleAICmd_if_equal_(void) // same as if_equal gAIScriptPtr += 6; } -static void BattleAICmd_if_not_equal_(void) // same as if_not_equal +static void BattleAICmd_if_not_equal_(void) // Same as if_not_equal. { if (gAIScriptPtr[1] != AI_THINKING_STRUCT->funcResult) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); @@ -1273,9 +1280,9 @@ static void BattleAICmd_nullsub_2B(void) static void BattleAICmd_count_usable_party_mons(void) { u8 battlerId; - u8 bankOnField1, bankOnField2; + u8 battlerOnField1, battlerOnField2; struct Pokemon *party; - int i; + s32 i; AI_THINKING_STRUCT->funcResult = 0; @@ -1292,19 +1299,19 @@ static void BattleAICmd_count_usable_party_mons(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { u32 position; - bankOnField1 = gBattlerPartyIndexes[battlerId]; + battlerOnField1 = gBattlerPartyIndexes[battlerId]; position = GetBattlerPosition(battlerId) ^ BIT_FLANK; - bankOnField2 = gBattlerPartyIndexes[GetBattlerAtPosition(position)]; + battlerOnField2 = gBattlerPartyIndexes[GetBattlerAtPosition(position)]; } - else // in singles there's only one battlerId by side + else // In singles there's only one battlerId by side. { - bankOnField1 = gBattlerPartyIndexes[battlerId]; - bankOnField2 = gBattlerPartyIndexes[battlerId]; + battlerOnField1 = gBattlerPartyIndexes[battlerId]; + battlerOnField2 = gBattlerPartyIndexes[battlerId]; } for (i = 0; i < PARTY_SIZE; i++) { - if (i != bankOnField1 && i != bankOnField2 + if (i != battlerOnField1 && i != battlerOnField2 && GetMonData(&party[i], MON_DATA_HP) != 0 && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) @@ -1362,22 +1369,18 @@ static void BattleAICmd_get_ability(void) { // AI has no knowledge of opponent, so it guesses which ability. if (Random() & 1) - { AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability1; - } else - { AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability2; - } } else { - AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability1; // it's definitely ability 1. + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability1; // It's definitely ability 1. } } else { - AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability2; // AI cant actually reach this part since every mon has at least 1 ability. + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability2; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. } } else @@ -1385,22 +1388,23 @@ static void BattleAICmd_get_ability(void) // The AI knows its own ability. AI_THINKING_STRUCT->funcResult = gBattleMons[battlerId].ability; } + gAIScriptPtr += 2; } static void BattleAICmd_check_ability(void) { - u32 battlerId = BattleAI_GetWantedBank(gAIScriptPtr[1]); + u32 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); u32 ability = gAIScriptPtr[2]; if (gAIScriptPtr[1] == AI_TARGET || gAIScriptPtr[1] == AI_TARGET_PARTNER) { - if (BATTLE_HISTORY->abilities[battlerId] != 0) + if (BATTLE_HISTORY->abilities[battlerId] != ABILITY_NONE) { ability = BATTLE_HISTORY->abilities[battlerId]; AI_THINKING_STRUCT->funcResult = ability; } - // abilities that prevent fleeing. + // Abilities that prevent fleeing. else if (gBattleMons[battlerId].ability == ABILITY_SHADOW_TAG || gBattleMons[battlerId].ability == ABILITY_MAGNET_PULL || gBattleMons[battlerId].ability == ABILITY_ARENA_TRAP) @@ -1411,14 +1415,16 @@ static void BattleAICmd_check_ability(void) { if (gBaseStats[gBattleMons[battlerId].species].ability2 != ABILITY_NONE) { - u8 abilityDummyVariable = ability; // needed to match + u8 abilityDummyVariable = ability; // Needed to match. if (gBaseStats[gBattleMons[battlerId].species].ability1 != abilityDummyVariable && gBaseStats[gBattleMons[battlerId].species].ability2 != abilityDummyVariable) { ability = gBaseStats[gBattleMons[battlerId].species].ability1; } else - ability = 0; + { + ability = ABILITY_NONE; + } } else { @@ -1427,7 +1433,7 @@ static void BattleAICmd_check_ability(void) } else { - ability = gBaseStats[gBattleMons[battlerId].species].ability2; // AI cant actually reach this part since every mon has at least 1 ability. + ability = gBaseStats[gBattleMons[battlerId].species].ability2; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. } } else @@ -1435,25 +1441,21 @@ static void BattleAICmd_check_ability(void) // The AI knows its own or partner's ability. ability = gBattleMons[battlerId].ability; } + if (ability == 0) - { - AI_THINKING_STRUCT->funcResult = 2; // unable to answer - } + AI_THINKING_STRUCT->funcResult = 2; // Unable to answer. else if (ability == gAIScriptPtr[2]) - { - AI_THINKING_STRUCT->funcResult = 1; // pokemon has the ability we wanted to check - } + AI_THINKING_STRUCT->funcResult = 1; // Pokemon has the ability we wanted to check. else - { - AI_THINKING_STRUCT->funcResult = 0; // pokemon doesn't have the ability we wanted to check - } + AI_THINKING_STRUCT->funcResult = 0; // Pokemon doesn't have the ability we wanted to check. + gAIScriptPtr += 3; } static void BattleAICmd_get_highest_type_effectiveness(void) { s32 i; - u8* dynamicMoveType; + u8 *dynamicMoveType; gDynamicBasePower = 0; dynamicMoveType = &gBattleStruct->dynamicMoveType; @@ -1465,19 +1467,18 @@ static void BattleAICmd_get_highest_type_effectiveness(void) for (i = 0; i < 4; i++) { - gBattleMoveDamage = AI_EFFECTIVENESS_x1; + gBattleMoveDamage = 40; gCurrentMove = gBattleMons[sBattler_AI].moves[i]; - if (gCurrentMove) + if (gCurrentMove != MOVE_NONE) { TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget); - // reduce by 1/3. - if (gBattleMoveDamage == 120) + if (gBattleMoveDamage == 120) // Super effective STAB. gBattleMoveDamage = AI_EFFECTIVENESS_x2; if (gBattleMoveDamage == 240) gBattleMoveDamage = AI_EFFECTIVENESS_x4; - if (gBattleMoveDamage == 30) + if (gBattleMoveDamage == 30) // Not very effective STAB. gBattleMoveDamage = AI_EFFECTIVENESS_x0_5; if (gBattleMoveDamage == 15) gBattleMoveDamage = AI_EFFECTIVENESS_x0_25; @@ -1489,6 +1490,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void) AI_THINKING_STRUCT->funcResult = gBattleMoveDamage; } } + gAIScriptPtr += 1; } @@ -1507,11 +1509,11 @@ static void BattleAICmd_if_type_effectiveness(void) TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget); - if (gBattleMoveDamage == 120) + if (gBattleMoveDamage == 120) // Super effective STAB. gBattleMoveDamage = AI_EFFECTIVENESS_x2; if (gBattleMoveDamage == 240) gBattleMoveDamage = AI_EFFECTIVENESS_x4; - if (gBattleMoveDamage == 30) + if (gBattleMoveDamage == 30) // Not very effective STAB. gBattleMoveDamage = AI_EFFECTIVENESS_x0_5; if (gBattleMoveDamage == 15) gBattleMoveDamage = AI_EFFECTIVENESS_x0_25; @@ -1519,7 +1521,7 @@ static void BattleAICmd_if_type_effectiveness(void) if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) gBattleMoveDamage = AI_EFFECTIVENESS_x0; - // store gBattleMoveDamage in a u8 variable because gAIScriptPtr[1] is a u8. + // Store gBattleMoveDamage in a u8 variable because gAIScriptPtr[1] is a u8. damageVar = gBattleMoveDamage; if (damageVar == gAIScriptPtr[1]) @@ -1539,18 +1541,18 @@ static void BattleAICmd_nullsub_33(void) static void BattleAICmd_if_status_in_party(void) { struct Pokemon *party; - int i; + s32 i; u32 statusToCompareTo; u8 battlerId; - switch(gAIScriptPtr[1]) + switch (gAIScriptPtr[1]) { - case AI_USER: - battlerId = sBattler_AI; - break; - default: - battlerId = gBattlerTarget; - break; + case AI_USER: + battlerId = sBattler_AI; + break; + default: + battlerId = gBattlerTarget; + break; } party = (GetBattlerSide(battlerId) == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty; @@ -1576,18 +1578,18 @@ static void BattleAICmd_if_status_in_party(void) static void BattleAICmd_if_status_not_in_party(void) { struct Pokemon *party; - int i; + s32 i; u32 statusToCompareTo; u8 battlerId; switch(gAIScriptPtr[1]) { - case 1: - battlerId = sBattler_AI; - break; - default: - battlerId = gBattlerTarget; - break; + case 1: + battlerId = sBattler_AI; + break; + default: + battlerId = gBattlerTarget; + break; } party = (GetBattlerSide(battlerId) == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty; @@ -1602,7 +1604,8 @@ static void BattleAICmd_if_status_not_in_party(void) if (species != SPECIES_NONE && species != SPECIES_EGG && hp != 0 && status == statusToCompareTo) { - gAIScriptPtr += 10; // still bugged in Emerald + gAIScriptPtr += 10; // UB: Still bugged in Emerald. Uncomment the return statement to fix. + // return; } } @@ -1718,7 +1721,7 @@ static void BattleAICmd_if_can_faint(void) gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100; - // moves always do at least 1 damage. + // Moves always do at least 1 damage. if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; @@ -1747,7 +1750,7 @@ static void BattleAICmd_if_cant_faint(void) gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100; - // this macro is missing the damage 0 = 1 assumption. + // This macro is missing the damage 0 = 1 assumption. if (gBattleMons[gBattlerTarget].hp > gBattleMoveDamage) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); @@ -1757,118 +1760,93 @@ static void BattleAICmd_if_cant_faint(void) static void BattleAICmd_if_has_move(void) { - int i; + s32 i; const u16 *movePtr = (u16 *)(gAIScriptPtr + 2); switch (gAIScriptPtr[1]) { - case AI_USER: - for (i = 0; i < 4; i++) - { - if (gBattleMons[sBattler_AI].moves[i] == *movePtr) - break; - } - if (i == 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } - case AI_USER_PARTNER: - if (gBattleMons[sBattler_AI ^ BIT_FLANK].hp == 0) - { - gAIScriptPtr += 8; - return; - } - else - { - for (i = 0; i < 4; i++) - { - if (gBattleMons[sBattler_AI ^ BIT_FLANK].moves[i] == *movePtr) - break; - } - } - if (i == 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } - case AI_TARGET: - case AI_TARGET_PARTNER: + case AI_USER: + for (i = 0; i < 4; i++) + { + if (gBattleMons[sBattler_AI].moves[i] == *movePtr) + break; + } + if (i == 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + case AI_USER_PARTNER: + if (gBattleMons[sBattler_AI ^ BIT_FLANK].hp == 0) + { + gAIScriptPtr += 8; + break; + } + else + { for (i = 0; i < 4; i++) { - if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr) + if (gBattleMons[sBattler_AI ^ BIT_FLANK].moves[i] == *movePtr) break; } - if (i == 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } + } + if (i == 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + case AI_TARGET: + case AI_TARGET_PARTNER: + for (i = 0; i < 4; i++) + { + if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr) + break; + } + if (i == 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; } } static void BattleAICmd_if_doesnt_have_move(void) { - int i; + s32 i; const u16 *movePtr = (u16 *)(gAIScriptPtr + 2); switch(gAIScriptPtr[1]) { - case AI_USER: - case AI_USER_PARTNER: // UB: no separate check for user partner - for (i = 0; i < 4; i++) - { - if (gBattleMons[sBattler_AI].moves[i] == *movePtr) - break; - } - if (i != 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } - case AI_TARGET: - case AI_TARGET_PARTNER: - for (i = 0; i < 4; i++) - { - if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr) - break; - } - if (i != 4) - { - gAIScriptPtr += 8; - return; - } - else - { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); - return; - } + case AI_USER: + case AI_USER_PARTNER: // UB: no separate check for user partner. + for (i = 0; i < 4; i++) + { + if (gBattleMons[sBattler_AI].moves[i] == *movePtr) + break; + } + if (i != 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + case AI_TARGET: + case AI_TARGET_PARTNER: + for (i = 0; i < 4; i++) + { + if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr) + break; + } + if (i != 4) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; } } static void BattleAICmd_if_has_move_with_effect(void) { - int i; + s32 i; switch (gAIScriptPtr[1]) { @@ -1888,7 +1866,7 @@ static void BattleAICmd_if_has_move_with_effect(void) case AI_TARGET_PARTNER: for (i = 0; i < 4; i++) { - // UB: checks sBattler_AI instead of gBattlerTarget + // UB: checks sBattler_AI instead of gBattlerTarget. if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i]].effect == gAIScriptPtr[2]) break; } @@ -1902,7 +1880,7 @@ static void BattleAICmd_if_has_move_with_effect(void) static void BattleAICmd_if_doesnt_have_move_with_effect(void) { - int i; + s32 i; switch (gAIScriptPtr[1]) { @@ -1944,25 +1922,22 @@ static void BattleAICmd_if_any_move_disabled_or_encored(void) if (gAIScriptPtr[2] == 0) { - if (gDisableStructs[battlerId].disabledMove == 0) - { + if (gDisableStructs[battlerId].disabledMove == MOVE_NONE) gAIScriptPtr += 7; - return; - } - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); - return; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); } - else if (gAIScriptPtr[2] != 1) // ignore the macro if its not 0 or 1. + else if (gAIScriptPtr[2] != 1) { gAIScriptPtr += 7; - return; } - else if (gDisableStructs[battlerId].encoredMove != 0) + else { - gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); - return; + if (gDisableStructs[battlerId].encoredMove != MOVE_NONE) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; } - gAIScriptPtr += 7; } static void BattleAICmd_if_curr_move_disabled_or_encored(void) @@ -1971,23 +1946,19 @@ static void BattleAICmd_if_curr_move_disabled_or_encored(void) { case 0: if (gDisableStructs[gActiveBattler].disabledMove == AI_THINKING_STRUCT->moveConsidered) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break;; case 1: if (gDisableStructs[gActiveBattler].encoredMove == AI_THINKING_STRUCT->moveConsidered) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break; default: gAIScriptPtr += 6; - return; + break; } } @@ -1998,7 +1969,7 @@ static void BattleAICmd_flee(void) static void BattleAICmd_if_random_safari_flee(void) { - u8 safariFleeRate = gBattleStruct->field_7B * 5; // safari flee rate, from 0-20 + u8 safariFleeRate = gBattleStruct->field_7B * 5; // Safari flee rate, from 0-20. if ((u8)(Random() % 100) < safariFleeRate) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); @@ -2030,7 +2001,7 @@ static void BattleAICmd_get_hold_effect(void) static void BattleAICmd_if_holds_item(void) { - u8 battlerId = BattleAI_GetWantedBank(gAIScriptPtr[1]); + u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); u16 item; u8 var1, var2; @@ -2107,7 +2078,7 @@ static void BattleAICmd_get_used_held_item(void) else battlerId = gBattlerTarget; - // This is likely a leftover from Ruby's code and its ugly ewram access + // This is likely a leftover from Ruby's code and its ugly ewram access. #ifdef NONMATCHING AI_THINKING_STRUCT->funcResult = gBattleStruct->usedHeldItems[battlerId]; #else @@ -2199,28 +2170,22 @@ static void BattleAICmd_if_level_cond(void) { case 0: // greater than if (gBattleMons[sBattler_AI].level > gBattleMons[gBattlerTarget].level) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break; case 1: // less than if (gBattleMons[sBattler_AI].level < gBattleMons[gBattlerTarget].level) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break; case 2: // equal if (gBattleMons[sBattler_AI].level == gBattleMons[gBattlerTarget].level) - { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); - return; - } - gAIScriptPtr += 6; - return; + else + gAIScriptPtr += 6; + break; } } @@ -2250,7 +2215,7 @@ static void BattleAICmd_if_target_is_ally(void) static void BattleAICmd_if_flash_fired(void) { - u8 battlerId = BattleAI_GetWantedBank(gAIScriptPtr[1]); + u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); if (gBattleResources->flags->flags[battlerId] & UNKNOWN_FLAG_FLASH_FIRE) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); @@ -2277,5 +2242,7 @@ static bool8 AIStackPop(void) return TRUE; } else + { return FALSE; + } } diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 83ad2b4fd..a105e7edf 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -19,18 +19,20 @@ static bool8 ShouldSwitchIfPerishSong(void) if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG && gDisableStructs[gActiveBattler].perishSongTimer1 == 0) { - *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; } - - return FALSE; + else + { + return FALSE; + } } static bool8 ShouldSwitchIfWonderGuard(void) { u8 opposingPosition; - u8 opposingBank; + u8 opposingBattler; u8 moveFlags; s32 i, j; s32 firstId; @@ -46,22 +48,22 @@ static bool8 ShouldSwitchIfWonderGuard(void) if (gBattleMons[GetBattlerAtPosition(opposingPosition)].ability != ABILITY_WONDER_GUARD) return FALSE; - // check if pokemon has a super effective move - for (opposingBank = GetBattlerAtPosition(opposingPosition), i = 0; i < 4; i++) + // Check if Pokemon has a super effective move. + for (opposingBattler = GetBattlerAtPosition(opposingPosition), i = 0; i < 4; i++) { move = gBattleMons[gActiveBattler].moves[i]; if (move == MOVE_NONE) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE) return FALSE; } - // get party information + // Get party information. if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -76,7 +78,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) else party = gEnemyParty; - // find a pokemon in the party that has a super effective move + // Find a Pokemon in the party that has a super effective move. for (i = firstId; i < lastId; i++) { if (GetMonData(&party[i], MON_DATA_HP) == 0) @@ -88,19 +90,19 @@ static bool8 ShouldSwitchIfWonderGuard(void) if (i == gBattlerPartyIndexes[gActiveBattler]) continue; - GetMonData(&party[i], MON_DATA_SPECIES); // unused return value - GetMonData(&party[i], MON_DATA_ALT_ABILITY); // unused return value + GetMonData(&party[i], MON_DATA_SPECIES); // Unused return value. + GetMonData(&party[i], MON_DATA_ALT_ABILITY); // Unused return value. - for (opposingBank = GetBattlerAtPosition(opposingPosition), j = 0; j < 4; j++) + for (opposingBattler = GetBattlerAtPosition(opposingPosition), j = 0; j < 4; j++) { move = GetMonData(&party[i], MON_DATA_MOVE1 + j); if (move == MOVE_NONE) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % 3 < 2) { - // we found a mon + // We found a mon. *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; @@ -108,12 +110,12 @@ static bool8 ShouldSwitchIfWonderGuard(void) } } - return FALSE; // at this point there is not a single pokemon in the party that has a super effective move against a pokemon with wonder guard + return FALSE; // There is not a single Pokemon in the party that has a super effective move against a mon with Wonder Guard. } static bool8 FindMonThatAbsorbsOpponentsMove(void) { - u8 bankIn1, bankIn2; + u8 battlerIn1, battlerIn2; u8 absorbingTypeAbility; s32 firstId; s32 lastId; // + 1 @@ -131,16 +133,16 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - bankIn1 = gActiveBattler; + battlerIn1 = gActiveBattler; if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))]) - bankIn2 = gActiveBattler; + battlerIn2 = gActiveBattler; else - bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))); + battlerIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))); } else { - bankIn1 = gActiveBattler; - bankIn2 = gActiveBattler; + battlerIn1 = gActiveBattler; + battlerIn2 = gActiveBattler; } if (gBattleMoves[gLastLandedMoves[gActiveBattler]].type == TYPE_FIRE) @@ -157,7 +159,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -183,13 +185,13 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) continue; if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) continue; - if (i == gBattlerPartyIndexes[bankIn1]) + if (i == gBattlerPartyIndexes[battlerIn1]) continue; - if (i == gBattlerPartyIndexes[bankIn2]) + if (i == gBattlerPartyIndexes[battlerIn2]) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; species = GetMonData(&party[i], MON_DATA_SPECIES); @@ -200,7 +202,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) if (absorbingTypeAbility == monAbility && Random() & 1) { - // we found a mon + // we found a mon. *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; @@ -221,13 +223,13 @@ static bool8 ShouldSwitchIfNaturalCure(void) if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1) { - *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; } else if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0 && Random() & 1) { - *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; } @@ -236,9 +238,10 @@ static bool8 ShouldSwitchIfNaturalCure(void) return TRUE; if (FindMonWithFlagsAndSuperEffective(MOVE_RESULT_NOT_VERY_EFFECTIVE, 1)) return TRUE; + if (Random() & 1) { - *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); return TRUE; } @@ -249,15 +252,15 @@ static bool8 ShouldSwitchIfNaturalCure(void) static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng) { u8 opposingPosition; - u8 opposingBank; + u8 opposingBattler; s32 i; u8 moveFlags; u16 move; opposingPosition = BATTLE_OPPOSITE(GetBattlerPosition(gActiveBattler)); - opposingBank = GetBattlerAtPosition(opposingPosition); + opposingBattler = GetBattlerAtPosition(opposingPosition); - if (!(gAbsentBattlerFlags & gBitTable[opposingBank])) + if (!(gAbsentBattlerFlags & gBitTable[opposingBattler])) { for (i = 0; i < 4; i++) { @@ -265,7 +268,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng) if (move == MOVE_NONE) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE) { if (noRng) @@ -278,9 +281,9 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng) if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) return FALSE; - opposingBank = GetBattlerAtPosition(BATTLE_PARTNER(opposingPosition)); + opposingBattler = GetBattlerAtPosition(BATTLE_PARTNER(opposingPosition)); - if (!(gAbsentBattlerFlags & gBitTable[opposingBank])) + if (!(gAbsentBattlerFlags & gBitTable[opposingBattler])) { for (i = 0; i < 4; i++) { @@ -288,7 +291,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng) if (move == MOVE_NONE) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[opposingBattler].species, gBattleMons[opposingBattler].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE) { if (noRng) @@ -318,7 +321,7 @@ static bool8 AreStatsRaised(void) static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) { - u8 bankIn1, bankIn2; + u8 battlerIn1, battlerIn2; s32 firstId; s32 lastId; // + 1 struct Pokemon *party; @@ -337,16 +340,16 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - bankIn1 = gActiveBattler; + battlerIn1 = gActiveBattler; if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))]) - bankIn2 = gActiveBattler; + battlerIn2 = gActiveBattler; else - bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))); + battlerIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))); } else { - bankIn1 = gActiveBattler; - bankIn2 = gActiveBattler; + battlerIn1 = gActiveBattler; + battlerIn2 = gActiveBattler; } if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) @@ -377,13 +380,13 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) continue; if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) continue; - if (i == gBattlerPartyIndexes[bankIn1]) + if (i == gBattlerPartyIndexes[battlerIn1]) continue; - if (i == gBattlerPartyIndexes[bankIn2]) + if (i == gBattlerPartyIndexes[battlerIn2]) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; species = GetMonData(&party[i], MON_DATA_SPECIES); @@ -395,7 +398,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBattler], species, monAbility); if (moveFlags & flags) { - bankIn1 = gLastHitBy[gActiveBattler]; + battlerIn1 = gLastHitBy[gActiveBattler]; for (j = 0; j < 4; j++) { @@ -403,7 +406,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) if (move == 0) continue; - moveFlags = AI_TypeCalc(move, gBattleMons[bankIn1].species, gBattleMons[bankIn1].ability); + moveFlags = AI_TypeCalc(move, gBattleMons[battlerIn1].species, gBattleMons[battlerIn1].ability); if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % moduloPercent == 0) { *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i; @@ -419,23 +422,23 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) static bool8 ShouldSwitch(void) { - u8 bankIn1, bankIn2; - u8 *activeBankPtr; // needed to match + u8 battlerIn1, battlerIn2; + u8 *activeBattlerPtr; // Needed to match. s32 firstId; s32 lastId; // + 1 struct Pokemon *party; s32 i; s32 availableToSwitch; - if (gBattleMons[*(activeBankPtr = &gActiveBattler)].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)) + if (gBattleMons[*(activeBattlerPtr = &gActiveBattler)].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)) return FALSE; if (gStatuses3[gActiveBattler] & STATUS3_ROOTED) return FALSE; - if (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_SHADOW_TAG, 0, 0)) + if (ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_SHADOW_TAG)) return FALSE; - if (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_ARENA_TRAP, 0, 0)) - return FALSE; // misses the flying or levitate check - if (AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_MAGNET_PULL, 0, 0)) + if (ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_ARENA_TRAP)) // Misses the flying type and Levitate check. + return FALSE; + if (ABILITY_ON_FIELD2(ABILITY_MAGNET_PULL)) { if (gBattleMons[gActiveBattler].type1 == TYPE_STEEL) return FALSE; @@ -448,21 +451,21 @@ static bool8 ShouldSwitch(void) availableToSwitch = 0; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - bankIn1 = *activeBankPtr; - if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(*activeBankPtr) ^ BIT_FLANK)]) - bankIn2 = *activeBankPtr; + battlerIn1 = *activeBattlerPtr; + if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(*activeBattlerPtr) ^ BIT_FLANK)]) + battlerIn2 = *activeBattlerPtr; else - bankIn2 = GetBattlerAtPosition(GetBattlerPosition(*activeBankPtr) ^ BIT_FLANK); + battlerIn2 = GetBattlerAtPosition(GetBattlerPosition(*activeBattlerPtr) ^ BIT_FLANK); } else { - bankIn1 = *activeBankPtr; - bankIn2 = *activeBankPtr; + battlerIn1 = *activeBattlerPtr; + battlerIn2 = *activeBattlerPtr; } if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -485,13 +488,13 @@ static bool8 ShouldSwitch(void) continue; if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) continue; - if (i == gBattlerPartyIndexes[bankIn1]) + if (i == gBattlerPartyIndexes[battlerIn1]) continue; - if (i == gBattlerPartyIndexes[bankIn2]) + if (i == gBattlerPartyIndexes[battlerIn2]) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; availableToSwitch++; @@ -521,10 +524,10 @@ static bool8 ShouldSwitch(void) void AI_TrySwitchOrUseItem(void) { struct Pokemon *party; - u8 bankIn1, bankIn2; + u8 battlerIn1, battlerIn2; s32 firstId; s32 lastId; // + 1 - u8 bankIdentity = GetBattlerPosition(gActiveBattler); + u8 battlerIdentity = GetBattlerPosition(gActiveBattler); if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) party = gPlayerParty; @@ -535,25 +538,25 @@ void AI_TrySwitchOrUseItem(void) { if (ShouldSwitch()) { - if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) == 6) + if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) == PARTY_SIZE) { s32 monToSwitchId = GetMostSuitableMonToSwitchInto(); - if (monToSwitchId == 6) + if (monToSwitchId == PARTY_SIZE) { if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - bankIn1 = GetBattlerAtPosition(bankIdentity); - bankIn2 = bankIn1; + battlerIn1 = GetBattlerAtPosition(battlerIdentity); + battlerIn2 = battlerIn1; } else { - bankIn1 = GetBattlerAtPosition(bankIdentity); - bankIn2 = GetBattlerAtPosition(bankIdentity ^ BIT_FLANK); + battlerIn1 = GetBattlerAtPosition(battlerIdentity); + battlerIn2 = GetBattlerAtPosition(battlerIdentity ^ BIT_FLANK); } if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -567,13 +570,13 @@ void AI_TrySwitchOrUseItem(void) { if (GetMonData(&party[monToSwitchId], MON_DATA_HP) == 0) continue; - if (monToSwitchId == gBattlerPartyIndexes[bankIn1]) + if (monToSwitchId == gBattlerPartyIndexes[battlerIn1]) continue; - if (monToSwitchId == gBattlerPartyIndexes[bankIn2]) + if (monToSwitchId == gBattlerPartyIndexes[battlerIn2]) continue; - if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; break; @@ -608,10 +611,10 @@ static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 } else if (TYPE_EFFECT_ATK_TYPE(i) == atkType) { - // check type1 + // Check type1. if (TYPE_EFFECT_DEF_TYPE(i) == defType1) *var = (*var * TYPE_EFFECT_MULTIPLIER(i)) / 10; - // check type2 + // Check type2. if (TYPE_EFFECT_DEF_TYPE(i) == defType2 && defType1 != defType2) *var = (*var * TYPE_EFFECT_MULTIPLIER(i)) / 10; } @@ -621,10 +624,10 @@ static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 u8 GetMostSuitableMonToSwitchInto(void) { - u8 opposingBank; - u8 bestDmg; // note : should be changed to u32 for obvious reasons + u8 opposingBattler; + u8 bestDmg; // Note : should be changed to u32 for obvious reasons. u8 bestMonId; - u8 bankIn1, bankIn2; + u8 battlerIn1, battlerIn2; s32 firstId; s32 lastId; // + 1 struct Pokemon *party; @@ -632,34 +635,34 @@ u8 GetMostSuitableMonToSwitchInto(void) u8 invalidMons; u16 move; - if (*(gBattleStruct->monToSwitchIntoId + gActiveBattler) != 6) + if (*(gBattleStruct->monToSwitchIntoId + gActiveBattler) != PARTY_SIZE) return *(gBattleStruct->monToSwitchIntoId + gActiveBattler); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) return gBattlerPartyIndexes[gActiveBattler] + 1; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - bankIn1 = gActiveBattler; + battlerIn1 = gActiveBattler; if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)]) - bankIn2 = gActiveBattler; + battlerIn2 = gActiveBattler; else - bankIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK); + battlerIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK); - // UB: It considers the opponent only player's side even though it can battle alongside player; - opposingBank = Random() & BIT_FLANK; - if (gAbsentBattlerFlags & gBitTable[opposingBank]) - opposingBank ^= BIT_FLANK; + // UB: It considers the opponent only player's side even though it can battle alongside player. + opposingBattler = Random() & BIT_FLANK; + if (gAbsentBattlerFlags & gBitTable[opposingBattler]) + opposingBattler ^= BIT_FLANK; } else { - opposingBank = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_SIDE); - bankIn1 = gActiveBattler; - bankIn2 = gActiveBattler; + opposingBattler = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_SIDE); + battlerIn1 = gActiveBattler; + battlerIn2 = gActiveBattler; } if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) { - if ((gActiveBattler & BIT_FLANK) == 0) + if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; else firstId = 3, lastId = 6; @@ -676,27 +679,27 @@ u8 GetMostSuitableMonToSwitchInto(void) invalidMons = 0; - while (invalidMons != 0x3F) // all mons are invalid + while (invalidMons != 0x3F) // All mons are invalid. { bestDmg = 0; bestMonId = 6; - // find the mon which type is the most suitable offensively + // Find the mon whose type is the most suitable offensively. for (i = firstId; i < lastId; i++) { u16 species = GetMonData(&party[i], MON_DATA_SPECIES); if (species != SPECIES_NONE && GetMonData(&party[i], MON_DATA_HP) != 0 && !(gBitTable[i] & invalidMons) - && gBattlerPartyIndexes[bankIn1] != i - && gBattlerPartyIndexes[bankIn2] != i - && i != *(gBattleStruct->monToSwitchIntoId + bankIn1) - && i != *(gBattleStruct->monToSwitchIntoId + bankIn2)) + && gBattlerPartyIndexes[battlerIn1] != i + && gBattlerPartyIndexes[battlerIn2] != i + && i != *(gBattleStruct->monToSwitchIntoId + battlerIn1) + && i != *(gBattleStruct->monToSwitchIntoId + battlerIn2)) { u8 type1 = gBaseStats[species].type1; u8 type2 = gBaseStats[species].type2; u8 typeDmg = 10; - ModulateByTypeEffectiveness(gBattleMons[opposingBank].type1, type1, type2, &typeDmg); - ModulateByTypeEffectiveness(gBattleMons[opposingBank].type2, type1, type2, &typeDmg); + ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type1, type1, type2, &typeDmg); + ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type2, type1, type2, &typeDmg); if (bestDmg < typeDmg) { bestDmg = typeDmg; @@ -709,24 +712,24 @@ u8 GetMostSuitableMonToSwitchInto(void) } } - // ok, we know the mon has the right typing but does it have at least one super effective move? - if (bestMonId != 6) + // Ok, we know the mon has the right typing but does it have at least one super effective move? + if (bestMonId != PARTY_SIZE) { for (i = 0; i < 4; i++) { move = GetMonData(&party[bestMonId], MON_DATA_MOVE1 + i); - if (move != MOVE_NONE && TypeCalc(move, gActiveBattler, opposingBank) & MOVE_RESULT_SUPER_EFFECTIVE) + if (move != MOVE_NONE && TypeCalc(move, gActiveBattler, opposingBattler) & MOVE_RESULT_SUPER_EFFECTIVE) break; } if (i != 4) - return bestMonId; // has both the typing and at least one super effective move + return bestMonId; // Has both the typing and at least one super effective move. - invalidMons |= gBitTable[bestMonId]; // sorry buddy, we want something better + invalidMons |= gBitTable[bestMonId]; // Sorry buddy, we want something better. } else { - invalidMons = 0x3F; // no viable mon to switch + invalidMons = 0x3F; // No viable mon to switch. } } @@ -738,20 +741,20 @@ u8 GetMostSuitableMonToSwitchInto(void) bestDmg = 0; bestMonId = 6; - // if we couldn't find the best mon in terms of typing, find the one that deals most damage + // If we couldn't find the best mon in terms of typing, find the one that deals most damage. for (i = firstId; i < lastId; i++) { if ((u16)(GetMonData(&party[i], MON_DATA_SPECIES)) == SPECIES_NONE) continue; if (GetMonData(&party[i], MON_DATA_HP) == 0) continue; - if (gBattlerPartyIndexes[bankIn1] == i) + if (gBattlerPartyIndexes[battlerIn1] == i) continue; - if (gBattlerPartyIndexes[bankIn2] == i) + if (gBattlerPartyIndexes[battlerIn2] == i) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)) continue; - if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2)) + if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)) continue; for (j = 0; j < 4; j++) @@ -760,8 +763,8 @@ u8 GetMostSuitableMonToSwitchInto(void) gBattleMoveDamage = 0; if (move != MOVE_NONE && gBattleMoves[move].power != 1) { - AI_CalcDmg(gActiveBattler, opposingBank); - TypeCalc(move, gActiveBattler, opposingBank); + AI_CalcDmg(gActiveBattler, opposingBattler); + TypeCalc(move, gActiveBattler, opposingBattler); } if (bestDmg < gBattleMoveDamage) { @@ -774,21 +777,21 @@ u8 GetMostSuitableMonToSwitchInto(void) return bestMonId; } -// TODO: use PokemonItemEffect struct instead of u8 once it's documented +// TODO: use PokemonItemEffect struct instead of u8 once it's documented. static u8 GetAI_ItemType(u8 itemId, const u8 *itemEffect) // NOTE: should take u16 as item Id argument { if (itemId == ITEM_FULL_RESTORE) return AI_ITEM_FULL_RESTORE; - if (itemEffect[4] & 4) + else if (itemEffect[4] & 4) return AI_ITEM_HEAL_HP; - if (itemEffect[3] & 0x3F) + else if (itemEffect[3] & 0x3F) return AI_ITEM_CURE_CONDITION; - if (itemEffect[0] & 0x3F || itemEffect[1] != 0 || itemEffect[2] != 0) + else if (itemEffect[0] & 0x3F || itemEffect[1] != 0 || itemEffect[2] != 0) return AI_ITEM_X_STAT; - if (itemEffect[3] & 0x80) + else if (itemEffect[3] & 0x80) return AI_ITEM_GUARD_SPECS; - - return AI_ITEM_NOT_RECOGNIZABLE; + else + return AI_ITEM_NOT_RECOGNIZABLE; } static bool8 ShouldUseItem(void) @@ -806,7 +809,7 @@ static bool8 ShouldUseItem(void) else party = gEnemyParty; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE @@ -821,7 +824,7 @@ static bool8 ShouldUseItem(void) u16 item; const u8 *itemEffects; u8 paramOffset; - u8 bankSide; + u8 battlerSide; if (i != 0 && validMons > (gBattleResources->battleHistory->itemsNo - i) + 1) continue; @@ -908,8 +911,8 @@ static bool8 ShouldUseItem(void) shouldUse = TRUE; break; case AI_ITEM_GUARD_SPECS: - bankSide = GetBattlerSide(gActiveBattler); - if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[bankSide].mistTimer == 0) + battlerSide = GetBattlerSide(gActiveBattler); + if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[battlerSide].mistTimer == 0) shouldUse = TRUE; break; case AI_ITEM_NOT_RECOGNIZABLE: diff --git a/src/battle_anim.c b/src/battle_anim.c index 8071736e6..b6f726897 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -120,7 +120,7 @@ EWRAM_DATA static u16 sSoundAnimFramesToWait = 0; EWRAM_DATA static u8 sMonAnimTaskIdArray[2] = {0}; EWRAM_DATA u8 gAnimMoveTurn = 0; EWRAM_DATA static u8 sAnimBackgroundFadeState = 0; -EWRAM_DATA static u16 sAnimMoveIndex = 0; // set but unused. +EWRAM_DATA static u16 sAnimMoveIndex = 0; // Set but unused. EWRAM_DATA u8 gBattleAnimAttacker = 0; EWRAM_DATA u8 gBattleAnimTarget = 0; EWRAM_DATA u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT] = {0}; @@ -179,6 +179,7 @@ static void (* const sScriptCmdTable[])(void) = ScriptCmd_stopsound }; +// code void ClearBattleAnimationVars(void) { s32 i; @@ -192,11 +193,11 @@ void ClearBattleAnimationVars(void) gAnimMovePower = 0; gAnimFriendship = 0; - // clear index array. + // Clear index array. for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) sAnimSpriteIndexArray[i] |= 0xFFFF; - // clear anim args. + // Clear anim args. for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; @@ -459,7 +460,7 @@ static void ScriptCmd_delay(void) gAnimScriptCallback = WaitAnimFrameCount; } -// wait for visual tasks to finish. +// Wait for visual tasks to finish. static void ScriptCmd_waitforvisualfinish(void) { if (gAnimVisualTaskCount == 0) @@ -486,7 +487,7 @@ static void ScriptCmd_end(void) s32 i; bool32 continuousAnim = FALSE; - // keep waiting as long as there is animations to be done. + // Keep waiting as long as there are animations to be done. if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0 || sMonAnimTaskIdArray[0] != 0xFF || sMonAnimTaskIdArray[1] != 0xFF) { @@ -495,10 +496,10 @@ static void ScriptCmd_end(void) return; } - // finish the sound effects. + // Finish the sound effects. if (IsSEPlaying()) { - if (++sSoundAnimFramesToWait <= 90) // wait 90 frames, then halt the sound effect. + if (++sSoundAnimFramesToWait <= 90) // Wait 90 frames, then halt the sound effect. { gAnimFramesToWait = 1; return; @@ -510,7 +511,7 @@ static void ScriptCmd_end(void) } } - // the SE has halted, so set the SE Frame Counter to 0 and continue. + // The SE has halted, so set the SE Frame Counter to 0 and continue. sSoundAnimFramesToWait = 0; for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) @@ -523,7 +524,7 @@ static void ScriptCmd_end(void) } } - if (!continuousAnim) // may have been used for debug? + if (!continuousAnim) // May have been used for debug? { m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); if (!IsContest()) @@ -592,12 +593,12 @@ static void ScriptCmd_monbg(void) bool8 toBG_2; u8 taskId; u8 battlerId; - u8 animBank; + u8 animBattler; sBattleAnimScriptPtr++; - animBank = sBattleAnimScriptPtr[0]; - if (animBank & ANIM_TARGET) + animBattler = sBattleAnimScriptPtr[0]; + if (animBattler & ANIM_TARGET) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -655,7 +656,7 @@ bool8 IsBattlerSpriteVisible(u8 battlerId) if (!IsBattlerSpritePresent(battlerId)) return FALSE; if (IsContest()) - return TRUE; // this line wont ever be reached. + return TRUE; // This line won't ever be reached. if (!gBattleSpritesDataPtr->battlerData[battlerId].invisible || !gSprites[gBattlerSpriteIds[battlerId]].invisible) return TRUE; @@ -847,32 +848,32 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) static void ScriptCmd_clearmonbg(void) { - u8 animBankId; + u8 animBattlerId; u8 battlerId; u8 taskId; sBattleAnimScriptPtr++; - animBankId = sBattleAnimScriptPtr[0]; + animBattlerId = sBattleAnimScriptPtr[0]; - if (animBankId == ANIM_ATTACKER) - animBankId = ANIM_ATK_PARTNER; - else if (animBankId == ANIM_TARGET) - animBankId = ANIM_DEF_PARTNER; + if (animBattlerId == ANIM_ATTACKER) + animBattlerId = ANIM_ATK_PARTNER; + else if (animBattlerId == ANIM_TARGET) + animBattlerId = ANIM_DEF_PARTNER; - if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER) + if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; if (sMonAnimTaskIdArray[0] != 0xFF) gSprites[gBattlerSpriteIds[battlerId]].invisible = 0; - if (animBankId > 1 && sMonAnimTaskIdArray[1] != 0xFF) + if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF) gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = 0; else - animBankId = 0; + animBattlerId = 0; taskId = CreateTask(sub_80A4980, 5); - gTasks[taskId].data[0] = animBankId; + gTasks[taskId].data[0] = animBattlerId; gTasks[taskId].data[2] = battlerId; sBattleAnimScriptPtr++; @@ -910,18 +911,18 @@ static void ScriptCmd_monbg_22(void) { bool8 toBG_2; u8 battlerId; - u8 animBankId; + u8 animBattlerId; sBattleAnimScriptPtr++; - animBankId = sBattleAnimScriptPtr[0]; + animBattlerId = sBattleAnimScriptPtr[0]; - if (animBankId == ANIM_ATTACKER) - animBankId = ANIM_ATK_PARTNER; - else if (animBankId == ANIM_TARGET) - animBankId = ANIM_DEF_PARTNER; + if (animBattlerId == ANIM_ATTACKER) + animBattlerId = ANIM_ATK_PARTNER; + else if (animBattlerId == ANIM_TARGET) + animBattlerId = ANIM_DEF_PARTNER; - if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER) + if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; @@ -938,7 +939,7 @@ static void ScriptCmd_monbg_22(void) } battlerId ^= BIT_FLANK; - if (animBankId > 1 && IsBattlerSpriteVisible(battlerId)) + if (animBattlerId > 1 && IsBattlerSpriteVisible(battlerId)) { u8 position = GetBattlerPosition(battlerId); if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest()) @@ -954,32 +955,32 @@ static void ScriptCmd_monbg_22(void) static void ScriptCmd_clearmonbg_23(void) { - u8 animBankId; + u8 animBattlerId; u8 battlerId; u8 taskId; sBattleAnimScriptPtr++; - animBankId = sBattleAnimScriptPtr[0]; + animBattlerId = sBattleAnimScriptPtr[0]; - if (animBankId == ANIM_ATTACKER) - animBankId = ANIM_ATK_PARTNER; - else if (animBankId == ANIM_TARGET) - animBankId = ANIM_DEF_PARTNER; + if (animBattlerId == ANIM_ATTACKER) + animBattlerId = ANIM_ATK_PARTNER; + else if (animBattlerId == ANIM_TARGET) + animBattlerId = ANIM_DEF_PARTNER; - if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER) + if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER) battlerId = gBattleAnimAttacker; else battlerId = gBattleAnimTarget; if (IsBattlerSpriteVisible(battlerId)) gSprites[gBattlerSpriteIds[battlerId]].invisible = 0; - if (animBankId > 1 && IsBattlerSpriteVisible(battlerId ^ BIT_FLANK)) + if (animBattlerId > 1 && IsBattlerSpriteVisible(battlerId ^ BIT_FLANK)) gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = 0; else - animBankId = 0; + animBattlerId = 0; taskId = CreateTask(sub_80A4BB0, 5); - gTasks[taskId].data[0] = animBankId; + gTasks[taskId].data[0] = animBattlerId; gTasks[taskId].data[2] = battlerId; sBattleAnimScriptPtr++; @@ -1419,18 +1420,18 @@ void Task_PanFromInitialToTarget(u8 taskId) pan = currentPan + incrementPan; gTasks[taskId].tCurrentPan = pan; - if (incrementPan == 0) // If we're not incrementing, just cancel the task immediately + if (incrementPan == 0) // If we're not incrementing, just cancel the task immediately. { destroyTask = TRUE; } - else if (initialPanning < targetPanning) // Panning increasing + else if (initialPanning < targetPanning) // Panning increasing. { - if (pan >= targetPanning) // Target reached + if (pan >= targetPanning) // Target reached. destroyTask = TRUE; } - else // Panning decreasing + else // Panning decreasing. { - if (pan <= targetPanning) // Target reached + if (pan <= targetPanning) // Target reached. destroyTask = TRUE; } @@ -1684,14 +1685,14 @@ static void ScriptCmd_jumpifcontest(void) static void ScriptCmd_monbgprio_28(void) { - u8 wantedBank; + u8 wantedBattler; u8 battlerId; u8 battlerPosition; - wantedBank = sBattleAnimScriptPtr[1]; + wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; - if (wantedBank != ANIM_ATTACKER) + if (wantedBattler != ANIM_ATTACKER) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -1716,15 +1717,15 @@ static void ScriptCmd_monbgprio_29(void) static void ScriptCmd_monbgprio_2A(void) { - u8 wantedBank; + u8 wantedBattler; u8 battlerPosition; u8 battlerId; - wantedBank = sBattleAnimScriptPtr[1]; + wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; if (GetBattlerSide(gBattleAnimAttacker) != GetBattlerSide(gBattleAnimTarget)) { - if (wantedBank != ANIM_ATTACKER) + if (wantedBattler != ANIM_ATTACKER) battlerId = gBattleAnimTarget; else battlerId = gBattleAnimAttacker; @@ -1762,16 +1763,16 @@ static void ScriptCmd_visible(void) static void ScriptCmd_doublebattle_2D(void) { - u8 wantedBank; + u8 wantedBattler; u8 r4; u8 spriteId; - wantedBank = sBattleAnimScriptPtr[1]; + wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; if (!IsContest() && IsDoubleBattle() && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { - if (wantedBank == ANIM_ATTACKER) + if (wantedBattler == ANIM_ATTACKER) { r4 = sub_80A8364(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); @@ -1797,16 +1798,16 @@ static void ScriptCmd_doublebattle_2D(void) static void ScriptCmd_doublebattle_2E(void) { - u8 wantedBank; + u8 wantedBattler; u8 r4; u8 spriteId; - wantedBank = sBattleAnimScriptPtr[1]; + wantedBattler = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; if (!IsContest() && IsDoubleBattle() && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) { - if (wantedBank == ANIM_ATTACKER) + if (wantedBattler == ANIM_ATTACKER) { r4 = sub_80A8364(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 2316b9759..5a829171e 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -133,13 +133,13 @@ void sub_8158D8C(u8 taskId) if (gBattleAnimArgs[0] == ANIM_ATTACKER) species = gContestResources->field_18->field_0; else - DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task + DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. } else { u8 battlerId; - // get wanted battler + // Get wanted battler. if (gBattleAnimArgs[0] == ANIM_ATTACKER) battlerId = gBattleAnimAttacker; else if (gBattleAnimArgs[0] == ANIM_TARGET) @@ -149,7 +149,7 @@ void sub_8158D8C(u8 taskId) else battlerId = BATTLE_PARTNER(gBattleAnimTarget); - // check if battler is visible + // Check if battler is visible. if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) { DestroyAnimVisualTask(taskId); @@ -179,13 +179,13 @@ void sub_8158E9C(u8 taskId) if (gBattleAnimArgs[0] == ANIM_ATTACKER) species = gContestResources->field_18->field_0; else - DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task + DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. } else { u8 battlerId; - // get wanted battler + // Get wanted battler. if (gBattleAnimArgs[0] == ANIM_ATTACKER) battlerId = gBattleAnimAttacker; else if (gBattleAnimArgs[0] == ANIM_TARGET) @@ -195,7 +195,7 @@ void sub_8158E9C(u8 taskId) else battlerId = BATTLE_PARTNER(gBattleAnimTarget); - // check if battler is visible + // Check if battler is visible. if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId)) { DestroyAnimVisualTask(taskId); diff --git a/src/battle_bg.c b/src/battle_bg.c index d4bfd297a..4895e9643 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -31,8 +31,8 @@ struct BattleBackground extern const struct SpriteTemplate gUnknown_0831A9D0; extern const struct SpriteTemplate gUnknown_0831A9E8; extern const struct CompressedSpriteSheet gUnknown_0831AA00; -extern const struct BgTemplate gUnknown_0831AA08[4]; -extern const struct WindowTemplate *gUnknown_0831ABA0[]; +extern const struct BgTemplate gBattleBgTemplates[4]; +extern const struct WindowTemplate *const gBattleWindowTemplates[]; extern const struct BattleBackground gBattleTerrainTable[]; extern u16 gBattle_BG1_X; @@ -42,23 +42,23 @@ extern u16 gBattle_BG2_Y; extern u8 GetCurrentMapBattleScene(void); -void sub_8035658(void) +void BattleInitBgsAndWindows(void) { ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_0831AA08, ARRAY_COUNT(gUnknown_0831AA08)); + InitBgsFromTemplates(0, gBattleBgTemplates, ARRAY_COUNT(gBattleBgTemplates)); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) { - gBattleScripting.field_24 = 1; + gBattleScripting.windowsType = 1; SetBgTilemapBuffer(1, gUnknown_02023060); SetBgTilemapBuffer(2, gUnknown_02023060); } else { - gBattleScripting.field_24 = 0; + gBattleScripting.windowsType = 0; } - InitWindows(gUnknown_0831ABA0[gBattleScripting.field_24]); + InitWindows(gBattleWindowTemplates[gBattleScripting.windowsType]); DeactivateAllTextPrinters(); } @@ -66,23 +66,23 @@ void sub_80356D0(void) { DisableInterrupts(INTR_FLAG_HBLANK); EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); - sub_8035658(); + BattleInitBgsAndWindows(); SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJWIN_ON | DISPCNT_WIN0_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); } -void ApplyPlayerChosenFrameToBattleMenu(void) +void LoadBattleMenuWindowGfx(void) { - sub_809882C(2, 0x12, 0x10); - sub_809882C(2, 0x22, 0x10); + LoadSav2WindowGfx(2, 0x12, 0x10); + LoadSav2WindowGfx(2, 0x22, 0x10); LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20); if (gBattleTypeFlags & BATTLE_TYPE_ARENA) { sub_81978B0(0x70); - copy_textbox_border_tile_patterns_to_vram(0, 0x30, 0x70); + LoadMessageBoxGfx(0, 0x30, 0x70); gPlttBufferUnfaded[0x76] = 0; CpuCopy16(&gPlttBufferUnfaded[0x76], &gPlttBufferFaded[0x76], 2); } @@ -193,12 +193,12 @@ void LoadBattleTextboxAndBackground(void) CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); CopyBgTilemapBufferToVram(0); LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40); - ApplyPlayerChosenFrameToBattleMenu(); + LoadBattleMenuWindowGfx(); DrawMainBattleBackground(); } -static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY) +static void sub_8035AE4(u8 taskId, u8 battlerId, u8 bgId, u8 destX, u8 destY) { s32 i; u16 var = 0; @@ -208,7 +208,7 @@ static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY) { if (gTasks[taskId].data[5] != 0) { - switch (bank) + switch (battlerId) { case 0: var = 0x3F & gTasks[taskId].data[3]; @@ -226,7 +226,7 @@ static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY) } else { - switch (bank) + switch (battlerId) { case 0: var = 0x3F & gTasks[taskId].data[3]; @@ -253,7 +253,7 @@ static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY) } else { - if (bank == gBattleScripting.multiplayerId) + if (battlerId == gBattleScripting.multiplayerId) var = gTasks[taskId].data[3]; else var = gTasks[taskId].data[4]; @@ -272,7 +272,7 @@ static void sub_8035C4C(void) { if (gBattleOutcome == B_OUTCOME_DREW) { - BattleHandleAddTextPrinter(gText_Draw, 0x15); + BattlePutTextOnWindow(gText_Draw, 0x15); } else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -281,20 +281,20 @@ static void sub_8035C4C(void) switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18) { case 0: - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); break; case 1: - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); break; case 2: - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); break; case 3: - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); break; } } @@ -303,20 +303,20 @@ static void sub_8035C4C(void) switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18) { case 0: - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); break; case 1: - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); break; case 2: - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); break; case 3: - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); break; } } @@ -325,26 +325,26 @@ static void sub_8035C4C(void) { if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0) { - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); } else { - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); } } else { if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0) { - BattleHandleAddTextPrinter(gText_Win, 0x16); - BattleHandleAddTextPrinter(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, 0x16); + BattlePutTextOnWindow(gText_Loss, 0x17); } else { - BattleHandleAddTextPrinter(gText_Win, 0x17); - BattleHandleAddTextPrinter(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, 0x17); + BattlePutTextOnWindow(gText_Loss, 0x16); } } } @@ -368,19 +368,19 @@ void sub_8035D74(u8 taskId) switch (linkPlayer->lp_field_18) { case 0: - BattleHandleAddTextPrinter(name, 0x11); + BattlePutTextOnWindow(name, 0x11); sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 4); break; case 1: - BattleHandleAddTextPrinter(name, 0x12); + BattlePutTextOnWindow(name, 0x12); sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 4); break; case 2: - BattleHandleAddTextPrinter(name, 0x13); + BattlePutTextOnWindow(name, 0x13); sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 8); break; case 3: - BattleHandleAddTextPrinter(name, 0x14); + BattlePutTextOnWindow(name, 0x14); sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 8); break; } @@ -396,10 +396,10 @@ void sub_8035D74(u8 taskId) opponentId = playerId, playerId = opponentId_copy; name = gLinkPlayers[playerId].name; - BattleHandleAddTextPrinter(name, 0xF); + BattlePutTextOnWindow(name, 0xF); name = gLinkPlayers[opponentId].name; - BattleHandleAddTextPrinter(name, 0x10); + BattlePutTextOnWindow(name, 0x10); sub_8035AE4(taskId, playerId, 1, 2, 7); sub_8035AE4(taskId, opponentId, 2, 2, 7); @@ -457,7 +457,7 @@ void sub_8035D74(u8 taskId) } } -void LoadBattleEntryBackground(void) +void DrawBattleEntryBackground(void) { if (gBattleTypeFlags & BATTLE_TYPE_LINK) { @@ -740,7 +740,7 @@ bool8 LoadChosenBattleElement(u8 caseId) } break; case 6: - ApplyPlayerChosenFrameToBattleMenu(); + LoadBattleMenuWindowGfx(); break; default: ret = TRUE; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index a4aac55e2..905e957ea 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1475,7 +1475,7 @@ static void LinkOpponentHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; BattleTv_SetDataBasedOnString(*stringId); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index d742d5df2..3178bad0e 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1299,7 +1299,7 @@ static void LinkPartnerHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; BattleTv_SetDataBasedOnString(*stringId); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 64cf16b86..ae407af24 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1511,7 +1511,7 @@ static void OpponentHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; sub_81A57E4(gActiveBattler, *stringId); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e0694029a..627b13e22 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -620,7 +620,7 @@ static void HandleInputChooseMove(void) gMultiUsePlayerCursor = gMoveSelectionCursor[gActiveBattler] + 1; MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27); - BattleHandleAddTextPrinter(gText_BattleSwitchWhich, 0xB); + BattlePutTextOnWindow(gText_BattleSwitchWhich, 0xB); gBattlerControllerFuncs[gActiveBattler] = HandleMoveSwitchting; } } @@ -1458,7 +1458,7 @@ static void MoveSelectionDisplayMoveNames(void) { MoveSelectionDestroyCursorAt(i); StringCopy(gDisplayedStringBattle, gMoveNames[moveInfo->moves[i]]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, i + 3); + BattlePutTextOnWindow(gDisplayedStringBattle, i + 3); if (moveInfo->moves[i] != MOVE_NONE) gNumberOfMovesToChoose++; } @@ -1467,7 +1467,7 @@ static void MoveSelectionDisplayMoveNames(void) static void MoveSelectionDisplayPpString(void) { StringCopy(gDisplayedStringBattle, gText_MoveInterfacePP); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 7); + BattlePutTextOnWindow(gDisplayedStringBattle, 7); } static void MoveSelectionDisplayPpNumber(void) @@ -1485,7 +1485,7 @@ static void MoveSelectionDisplayPpNumber(void) txtPtr++; ConvertIntToDecimalStringN(txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 9); + BattlePutTextOnWindow(gDisplayedStringBattle, 9); } static void MoveSelectionDisplayMoveType(void) @@ -1502,7 +1502,7 @@ static void MoveSelectionDisplayMoveType(void) txtPtr++; StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 10); + BattlePutTextOnWindow(gDisplayedStringBattle, 10); } static void MoveSelectionCreateCursorAt(u8 cursorPosition, u8 arg1) @@ -1573,7 +1573,7 @@ static void PrintLinkStandbyMsg(void) { gBattle_BG0_X = 0; gBattle_BG0_Y = 0; - BattleHandleAddTextPrinter(gText_LinkStandby, 0); + BattlePutTextOnWindow(gText_LinkStandby, 0); } } @@ -2536,7 +2536,7 @@ static void PlayerHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2; BattleTv_SetDataBasedOnString(*stringId); sub_81A57E4(gActiveBattler, *stringId); @@ -2566,14 +2566,14 @@ static void PlayerHandleChooseAction(void) gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; BattleTv_ClearExplosionFaintCause(); - BattleHandleAddTextPrinter(gText_BattleMenu, 2); + BattlePutTextOnWindow(gText_BattleMenu, 2); for (i = 0; i < 4; i++) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, 1); } static void PlayerHandleUnknownYesNoBox(void) @@ -2581,7 +2581,7 @@ static void PlayerHandleUnknownYesNoBox(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 12); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 12); gMultiUsePlayerCursor = 1; BattleCreateYesNoCursorAt(1); gBattlerControllerFuncs[gActiveBattler] = PlayerHandleUnknownYesNoInput; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index f18f582f7..25eef4c5c 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -1492,7 +1492,7 @@ static void PlayerPartnerHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2; } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 4d1ccbaca..b4bdfaa4e 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -1404,7 +1404,7 @@ static void RecordedOpponentHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index b16c3f307..24cb58ea4 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -1409,7 +1409,7 @@ static void RecordedPlayerHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 09776f150..245447d8d 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -427,7 +427,7 @@ static void SafariHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } @@ -454,14 +454,14 @@ static void SafariHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattleHandleAddTextPrinter(gText_SafariZoneMenu, 2); + BattlePutTextOnWindow(gText_SafariZoneMenu, 2); for (i = 0; i < 4; i++) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo2); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, 1); } static void SafariHandleUnknownYesNoBox(void) diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index ca7b2fd44..e8efb404f 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1179,7 +1179,7 @@ static void WallyHandlePrintString(void) gBattle_BG0_Y = 0; stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } @@ -1206,14 +1206,14 @@ static void WallyHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattleHandleAddTextPrinter(gText_BattleMenu, 2); + BattlePutTextOnWindow(gText_BattleMenu, 2); for (i = 0; i < 4; i++) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillWallyDo); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, 1); } static void WallyHandleUnknownYesNoBox(void) diff --git a/src/battle_main.c b/src/battle_main.c index 8649209c0..2d24d0dab 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -82,8 +82,8 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern u8 gUnknown_0203CF00[]; extern const u16 gBattleTextboxPalette[]; // battle textbox palette -extern const struct BgTemplate gUnknown_0831AA08[]; -extern const struct WindowTemplate * const gUnknown_0831ABA0[]; +extern const struct BgTemplate gBattleBgTemplates[]; +extern const struct WindowTemplate * const gBattleWindowTemplates[]; extern const u8 gUnknown_0831ACE0[]; extern const u8 * const gBattleScriptsForMoveEffects[]; extern const u8 * const gBattlescriptsForBallThrow[]; @@ -652,7 +652,7 @@ static void CB2_InitBattleInternal(void) LoadBattleTextboxAndBackground(); ResetSpriteData(); ResetTasks(); - LoadBattleEntryBackground(); + DrawBattleEntryBackground(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); @@ -2210,10 +2210,10 @@ void sub_8038D64(void) sub_80356D0(); LoadCompressedPalette(gBattleTextboxPalette, 0, 64); - ApplyPlayerChosenFrameToBattleMenu(); + LoadBattleMenuWindowGfx(); ResetSpriteData(); ResetTasks(); - LoadBattleEntryBackground(); + DrawBattleEntryBackground(); SetGpuReg(REG_OFFSET_WINOUT, 0x37); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 4; @@ -2327,7 +2327,7 @@ static void sub_8038F34(void) if (sub_800A520() == TRUE) { sub_800ADF8(); - BattleHandleAddTextPrinter(gText_LinkStandby3, 0); + BattlePutTextOnWindow(gText_LinkStandby3, 0); gBattleCommunication[MULTIUSE_STATE]++; } break; @@ -2363,25 +2363,25 @@ u32 sub_80391E0(u8 arrayId, u8 caseId) switch (caseId) { case 0: - ret = gUnknown_0831AA08[arrayId].bg; + ret = gBattleBgTemplates[arrayId].bg; break; case 1: - ret = gUnknown_0831AA08[arrayId].charBaseIndex; + ret = gBattleBgTemplates[arrayId].charBaseIndex; break; case 2: - ret = gUnknown_0831AA08[arrayId].mapBaseIndex; + ret = gBattleBgTemplates[arrayId].mapBaseIndex; break; case 3: - ret = gUnknown_0831AA08[arrayId].screenSize; + ret = gBattleBgTemplates[arrayId].screenSize; break; case 4: - ret = gUnknown_0831AA08[arrayId].paletteMode; + ret = gBattleBgTemplates[arrayId].paletteMode; break; case 5: - ret = gUnknown_0831AA08[arrayId].priority; + ret = gBattleBgTemplates[arrayId].priority; break; case 6: - ret = gUnknown_0831AA08[arrayId].baseTile; + ret = gBattleBgTemplates[arrayId].baseTile; break; } @@ -2406,7 +2406,7 @@ static void sub_80392A8(void) gBattle_BG3_Y = 0; sub_80356D0(); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); - ApplyPlayerChosenFrameToBattleMenu(); + LoadBattleMenuWindowGfx(); for (i = 0; i < 2; i++) LoadChosenBattleElement(i); @@ -2453,7 +2453,7 @@ static void sub_803939C(void) case 3: if (!gPaletteFade.active) { - BattleHandleAddTextPrinter(gText_RecordBattleToPass, 0); + BattlePutTextOnWindow(gText_RecordBattleToPass, 0); gBattleCommunication[MULTIUSE_STATE]++; } break; @@ -2461,7 +2461,7 @@ static void sub_803939C(void) if (!IsTextPrinterActive(0)) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleCommunication[CURSOR_POSITION] = 1; BattleCreateYesNoCursorAt(1); gBattleCommunication[MULTIUSE_STATE]++; @@ -2515,7 +2515,7 @@ static void sub_803939C(void) if (gMain.field_439_x4) { sub_800ADF8(); - BattleHandleAddTextPrinter(gText_LinkStandby3, 0); + BattlePutTextOnWindow(gText_LinkStandby3, 0); } gBattleCommunication[MULTIUSE_STATE]++; } @@ -2546,14 +2546,14 @@ static void sub_803939C(void) { PlaySE(SE_SAVE); BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordedOnPass); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattleCommunication[1] = 0x80; gBattleCommunication[MULTIUSE_STATE]++; } else { BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattleCommunication[1] = 0x80; gBattleCommunication[MULTIUSE_STATE]++; } @@ -2564,7 +2564,7 @@ static void sub_803939C(void) if (gMain.field_439_x4) { sub_800ADF8(); - BattleHandleAddTextPrinter(gText_LinkStandby3, 0); + BattlePutTextOnWindow(gText_LinkStandby3, 0); } gBattleCommunication[MULTIUSE_STATE]++; } @@ -2610,7 +2610,7 @@ static void TryCorrectShedinjaLanguage(struct Pokemon *mon) u32 sub_80397C4(u32 setId, u32 tableId) { - return gUnknown_0831ABA0[setId][tableId].width * 8; + return gBattleWindowTemplates[setId][tableId].width * 8; } #define sBattler data[0] @@ -3885,7 +3885,7 @@ static void TryDoEventsBeforeFirstTurn(void) TurnValuesCleanUp(FALSE); SpecialStatusesClear(); *(&gBattleStruct->field_91) = gAbsentBattlerFlags; - BattleHandleAddTextPrinter(gText_EmptyString3, 0); + BattlePutTextOnWindow(gText_EmptyString3, 0); gBattleMainFunc = HandleTurnActionSelectionState; ResetSentPokesToOpponentValue(); @@ -3992,7 +3992,7 @@ void BattleTurnPassed(void) *(gBattleStruct->monToSwitchIntoId + i) = 6; *(&gBattleStruct->field_91) = gAbsentBattlerFlags; - BattleHandleAddTextPrinter(gText_EmptyString3, 0); + BattlePutTextOnWindow(gText_EmptyString3, 0); gBattleMainFunc = HandleTurnActionSelectionState; gRandomTurnNumber = Random(); diff --git a/src/battle_message.c b/src/battle_message.c index 1f338db92..896b2197e 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -17,6 +17,20 @@ #include "recorded_battle.h" #include "international_string_util.h" +struct BattleWindowText +{ + u8 fillValue; + u8 fontId; + u8 x; + u8 y; + u8 letterSpacing; + u8 lineSpacing; + u8 speed; + u8 fgColor; + u8 bgColor; + u8 shadowColor; +}; + extern u8 gBattlerAbilities[MAX_BATTLERS_COUNT]; extern u8 gUnknown_0203C7B4; extern struct StringInfoBattle *gStringInfo; @@ -1351,67 +1365,590 @@ static const u16 sUnknownMoveTable[] = static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, EOS, 0, 0}; -static const u8 sUnknown_085CD42C[] = -{ - 0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1, - 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, - 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, - 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, - 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, - 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, - 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xC, 0xE, 0xB, 0x0, 0x0, - 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, - 0x1, 0x2, 0x1, 0x0, 0x0, 0x0, 0xC, 0xE, 0xB, 0x0, 0x0, 0xEE, 0x7, 0x0, - 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, - 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, - 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, - 0xE, 0xF, 0x0, 0x0, 0x0, 0x1, 0x20, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x2, - 0x0, 0x0, 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, - 0x0, 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, - 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, - 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, - 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0xFF, - 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, - 0x0, 0x0, 0x1, 0x0, 0x6, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, - 0x6, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x6, 0x0, 0x0 +static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = +{ + { // 0 + .fillValue = 0xFF, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 1 + .fillValue = 0xFF, + .fontId = 1, + .x = 1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 2 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 3 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 4 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 5 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 6 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 7 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 8 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 9 + .fillValue = 0xEE, + .fontId = 1, + .x = 2, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 10 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 11 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 12 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 13 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 14 + .fillValue = 0x0, + .fontId = 1, + .x = 32, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 2, + }, + { // 15 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 16 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 17 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 18 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 19 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 20 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 21 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, + { // 22 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, + { // 23 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, }; -static const u8 sUnknown_085CD54C[] = -{ - 0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1, - 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, - 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, - 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, - 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, - 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, - 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, 0x0, 0x0, 0xC, 0xE, 0xB, 0x0, 0x0, - 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, - 0x1, 0x2, 0x1, 0x0, 0x0, 0x0, 0xC, 0xE, 0xB, 0x0, 0x0, 0xEE, 0x7, 0x0, - 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x7, 0x0, 0x1, 0x0, - 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, - 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0xD, - 0xE, 0xF, 0x0, 0x0, 0x0, 0x1, 0x20, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x2, - 0x0, 0x0, 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0xE, 0xF, 0x0, - 0x0, 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, - 0xEE, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, - 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, - 0xFF, 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0xFF, - 0x1, 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0xEE, 0x1, 0xFF, 0x1, - 0x0, 0x0, 0x0, 0xD, 0xE, 0xF, 0x0, 0x0, 0x11, 0x1, 0x0, 0x1, 0x0, 0x0, - 0x1, 0x2, 0x1, 0x3, 0x0, 0x0 +static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = +{ + { // 0 + .fillValue = 0xFF, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 1 + .fillValue = 0xFF, + .fontId = 1, + .x = 1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 2 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 3 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 4 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 5 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 6 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 7 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 8 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 9 + .fillValue = 0xEE, + .fontId = 1, + .x = 2, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 10 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 11 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 12 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 13 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 14 + .fillValue = 0x0, + .fontId = 1, + .x = 32, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 2, + }, + { // 15 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 14, + .shadowColor = 15, + }, + { // 16 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 17 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 18 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 19 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 20 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 21 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 22 + .fillValue = 0x11, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 2, + .bgColor = 1, + .shadowColor = 3, + }, }; -static const u8 * const gUnknown_085CD660[] = +static const struct BattleWindowText *const sBattleTextOnWindowsInfo[] = { - sUnknown_085CD42C, sUnknown_085CD54C + sTextOnWindowsInfo_Normal, sTextOnWindowsInfo_Arena }; static const u8 sRecordedBattleTextSpeeds[] = {8, 4, 1, 0}; +// code void BufferStringBattle(u16 stringID) { s32 i; - const u8* stringPtr = NULL; + const u8 *stringPtr = NULL; gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBattler][4]); gLastUsedItem = gStringInfo->lastItem; @@ -2395,47 +2932,46 @@ static void sub_814F950(u8* dst) } } -void BattleHandleAddTextPrinter(const u8 *text, u8 arg1) +void BattlePutTextOnWindow(const u8 *text, u8 windowId) { - const u8 *r8 = gUnknown_085CD660[gBattleScripting.field_24]; - bool32 r9; + const struct BattleWindowText *textInfo = sBattleTextOnWindowsInfo[gBattleScripting.windowsType]; + bool32 toVram; struct TextSubPrinter textSubPrinter; u8 speed; - if (arg1 & 0x80) + if (windowId & 0x80) { - arg1 &= ~(0x80); - r9 = FALSE; + windowId &= ~(0x80); + toVram = FALSE; } else { - FillWindowPixelBuffer(arg1, r8[12 * arg1]); - r9 = TRUE; + FillWindowPixelBuffer(windowId, textInfo[windowId].fillValue); + toVram = TRUE; } textSubPrinter.current_text_offset = text; - textSubPrinter.windowId = arg1; - textSubPrinter.fontId = r8[(12 * arg1) + 1]; - textSubPrinter.x = r8[(12 * arg1) + 2]; - textSubPrinter.y = r8[(12 * arg1) + 3]; + textSubPrinter.windowId = windowId; + textSubPrinter.fontId = textInfo[windowId].fontId; + textSubPrinter.x = textInfo[windowId].x; + textSubPrinter.y = textInfo[windowId].y; textSubPrinter.currentX = textSubPrinter.x; textSubPrinter.currentY = textSubPrinter.y; - textSubPrinter.letterSpacing = r8[(12 * arg1) + 4]; - textSubPrinter.lineSpacing = r8[(12 * arg1) + 5]; + textSubPrinter.letterSpacing = textInfo[windowId].letterSpacing; + textSubPrinter.lineSpacing = textInfo[windowId].lineSpacing; textSubPrinter.fontColor_l = 0; - textSubPrinter.fgColor = r8[(12 * arg1) + 7]; - textSubPrinter.bgColor = r8[(12 * arg1) + 8]; - textSubPrinter.shadowColor = r8[(12 * arg1) + 9]; + textSubPrinter.fgColor = textInfo[windowId].fgColor; + textSubPrinter.bgColor = textInfo[windowId].bgColor; + textSubPrinter.shadowColor = textInfo[windowId].shadowColor; if (textSubPrinter.x == 0xFF) { - s32 var2; - u32 var = sub_80397C4(gBattleScripting.field_24, arg1); - var2 = GetStringCenterAlignXOffsetWithLetterSpacing(textSubPrinter.fontId, textSubPrinter.current_text_offset, var, textSubPrinter.letterSpacing); - textSubPrinter.x = textSubPrinter.currentX = var2; + u32 width = sub_80397C4(gBattleScripting.windowsType, windowId); + s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(textSubPrinter.fontId, textSubPrinter.current_text_offset, width, textSubPrinter.letterSpacing); + textSubPrinter.x = textSubPrinter.currentX = alignX; } - if (arg1 == 0x16) + if (windowId == 0x16) gTextFlags.flag_1 = 0; else gTextFlags.flag_1 = 1; @@ -2445,7 +2981,7 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1) else gTextFlags.flag_2 = 0; - if (arg1 == 0 || arg1 == 0x16) + if (windowId == 0 || windowId == 0x16) { if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) speed = 1; @@ -2458,16 +2994,16 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1) } else { - speed = r8[(12 * arg1) + 6]; + speed = textInfo[windowId].speed; gTextFlags.flag_0 = 0; } AddTextPrinter(&textSubPrinter, speed, NULL); - if (r9) + if (toVram) { - PutWindowTilemap(arg1); - CopyWindowToVram(arg1, 3); + PutWindowTilemap(windowId); + CopyWindowToVram(windowId, 3); } } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 811aba128..c26e5ac11 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5687,7 +5687,7 @@ static void atk5A_yesnoboxlearnmove(void) { case 0: HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleScripting.learnMoveState++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); @@ -5804,7 +5804,7 @@ static void atk5B_yesnoboxstoplearningmove(void) { case 0: HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleScripting.learnMoveState++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); @@ -6100,7 +6100,7 @@ static void atk67_yesnobox(void) { case 0: HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleCommunication[0]++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); @@ -6720,7 +6720,7 @@ static void atk76_various(void) break; case 16: BattleStringExpandPlaceholdersToDisplayedString(gRefereeStringsTable[gBattlescriptCurrInstr[1]]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0x16); + BattlePutTextOnWindow(gDisplayedStringBattle, 0x16); break; case 17: if (IsTextPrinterActive(0x16)) @@ -10406,7 +10406,7 @@ static void atkF3_trygivecaughtmonnick(void) { case 0: HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(0); diff --git a/src/berry_blender.c b/src/berry_blender.c index 2edb14748..55431af72 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -153,8 +153,8 @@ extern const u8 gText_234Players[]; extern void sub_800A418(void); extern u8 sub_800A9D8(void); -extern void sub_809882C(u8, u16, u8); -extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); +extern void LoadSav2WindowGfx(u8, u16, u8); +extern void LoadMessageBoxGfx(u8, u16, u8); extern void sub_81AABF0(void (*callback)(void)); extern void sub_800B4C0(void); extern void ClearLinkCallback(void); @@ -927,8 +927,8 @@ static void sub_807FAC8(void) InitBgsFromTemplates(1, sBerryBlenderBgTemplates, ARRAY_COUNT(sBerryBlenderBgTemplates)); SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); - sub_809882C(0, 1, 0xD0); - copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0); + LoadSav2WindowGfx(0, 1, 0xD0); + LoadMessageBoxGfx(0, 0x14, 0xF0); InitBerryBlenderWindows(); sBerryBlenderData->mainState++; @@ -1331,8 +1331,8 @@ static void sub_8080588(void) SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]); SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]); - sub_809882C(0, 1, 0xD0); - copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0); + LoadSav2WindowGfx(0, 1, 0xD0); + LoadMessageBoxGfx(0, 0x14, 0xF0); InitBerryBlenderWindows(); sBerryBlenderData->field_44 = 0; diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index ca2037d2f..266ea8250 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -202,6 +202,6 @@ static void InitClearSaveDataScreenWindows(void) InitWindows(sClearSaveTextWindow); DeactivateAllTextPrinters(); FillWindowPixelBuffer(0, 0); - sub_80987D4(0, 0, 2, 224); + LoadWindowGfx(0, 0, 2, 224); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); } diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 1ed38c67e..00e6236fe 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -655,7 +655,7 @@ static void CB2_EggHatch_1(void) case 9: if (!IsTextPrinterActive(sEggHatchData->windowId)) { - sub_809882C(sEggHatchData->windowId, 0x140, 0xE0); + LoadSav2WindowGfx(sEggHatchData->windowId, 0x140, 0xE0); CreateYesNoMenu(&sYesNoWinTemplate, 0x140, 0xE, 0); sEggHatchData->CB2_state++; } diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 74eac32de..84f00418c 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -635,7 +635,7 @@ static void Task_EvolutionScene(u8 taskID) if (!gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving); - BattleHandleAddTextPrinter(gStringVar4, 0); + BattlePutTextOnWindow(gStringVar4, 0); gTasks[taskID].tState++; } break; @@ -731,7 +731,7 @@ static void Task_EvolutionScene(u8 taskID) if (IsCryFinished()) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); - BattleHandleAddTextPrinter(gStringVar4, 0); + BattlePutTextOnWindow(gStringVar4, 0); PlayBGM(MUS_FANFA5); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); @@ -818,7 +818,7 @@ static void Task_EvolutionScene(u8 taskID) else // Fire Red leftover probably StringExpandPlaceholders(gStringVar4, gText_PkmnStoppedEvolving); - BattleHandleAddTextPrinter(gStringVar4, 0); + BattlePutTextOnWindow(gStringVar4, 0); gTasks[taskID].tEvoWasStopped = TRUE; gTasks[taskID].tState = 15; } @@ -829,7 +829,7 @@ static void Task_EvolutionScene(u8 taskID) BufferMoveToLearnIntoBattleTextBuff2(); PlayFanfare(MUS_FANFA1); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter gTasks[taskID].tState++; } @@ -846,7 +846,7 @@ static void Task_EvolutionScene(u8 taskID) { BufferMoveToLearnIntoBattleTextBuff2(); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState++; } break; @@ -854,7 +854,7 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState++; } break; @@ -862,7 +862,7 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tData7 = 5; gTasks[taskID].tData8 = 10; gTasks[taskID].tLearnMoveState++; @@ -871,7 +871,7 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0); - BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC); + BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC); gTasks[taskID].tLearnMoveState++; sEvoCursorPos = 0; BattleCreateYesNoCursorAt(0); @@ -939,7 +939,7 @@ static void Task_EvolutionScene(u8 taskID) if (IsHMMove2(move)) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState = 12; } else @@ -955,14 +955,14 @@ static void Task_EvolutionScene(u8 taskID) break; case 7: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState++; break; case 8: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tLearnMoveState++; } break; @@ -970,20 +970,20 @@ static void Task_EvolutionScene(u8 taskID) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tState = 20; } break; case 10: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tData7 = 11; gTasks[taskID].tData8 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 11: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_ID_ADDER]); - BattleHandleAddTextPrinter(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskID].tState = 15; break; case 12: @@ -1215,7 +1215,7 @@ static void Task_TradeEvolutionScene(u8 taskID) case 3: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - sub_809882C(0, 0xA8, 0xE0); + LoadSav2WindowGfx(0, 0xA8, 0xE0); CreateYesNoMenu(&gUnknown_0833900C, 0xA8, 0xE, 0); sEvoCursorPos = 0; gTasks[taskID].tLearnMoveState++; diff --git a/src/field_region_map.c b/src/field_region_map.c index b7d677c90..1edf1ab51 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -89,7 +89,7 @@ static void MCB2_InitRegionMapRegisters(void) InitBgsFromTemplates(1, gUnknown_085E5068, 2); InitWindows(gUnknown_085E5070); DeactivateAllTextPrinters(); - sub_809882C(0, 0x27, 0xd0); + LoadSav2WindowGfx(0, 0x27, 0xd0); clear_scheduled_bg_copies_to_vram(); SetMainCallback2(MCB2_FieldUpdateRegionMap); SetVBlankCallback(VBCB_FieldUpdateRegionMap); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 83df30d05..b0388e971 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -89,7 +89,7 @@ extern void sub_8197434(u8, u8); extern u16 sub_818D97C(u8 playerGender, u8); extern u16 sub_818D8AC(u16, u8, s16, s16, u8, u16); extern const void* stdpal_get(u8); -extern void sub_80987D4(u8, u8, u16, u8); +extern void LoadWindowGfx(u8, u8, u16, u8); extern u16 sub_818D820(u16); extern u16 sub_818D8F0(u16); extern u16 sub_818D7D8(u16 species, u32 trainerId, u32 personality, u8 arg3, s16 sp0, s16 sp1, u8 sp2, u16 sp3); @@ -725,7 +725,7 @@ static void sub_8173EE4(u8 taskId) ShowBg(3); gTasks[taskId].tPlayerSpriteID = sub_818D8AC(sub_818D97C(gSaveBlock2Ptr->playerGender, 1), 1, 120, 72, 6, 0xFFFF); AddWindow(&sHof_WindowTemplate); - sub_80987D4(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0); + LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0); LoadPalette(stdpal_get(1), 0xE0, 0x20); gTasks[taskId].tFrameCount = 120; gTasks[taskId].func = Task_Hof_WaitAndPrintPlayerInfo; diff --git a/src/item_menu.c b/src/item_menu.c index 0642c771e..5a0929a7c 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2103,8 +2103,8 @@ void setup_bag_menu_textboxes(void) InitWindows(gUnknown_08614174); DeactivateAllTextPrinters(); - sub_809882C(0, 1, -32); - copy_textbox_border_tile_patterns_to_vram(0, 10, -48); + LoadSav2WindowGfx(0, 1, -32); + LoadMessageBoxGfx(0, 10, -48); sub_819A2BC(-64, 1); LoadPalette(&gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < 3; i++) diff --git a/src/list_menu.c b/src/list_menu.c index de7de8269..d4a8976a5 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -337,7 +337,7 @@ s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenu switch (arg2) { case 2: - sub_809882C(gUnknown_0203CE84.field_5, tileNum, palNum); + LoadSav2WindowGfx(gUnknown_0203CE84.field_5, tileNum, palNum); case 1: sub_8098858(gUnknown_0203CE84.field_5, tileNum, palNum / 16); break; diff --git a/src/main_menu.c b/src/main_menu.c index 3490424af..0f703a014 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1038,7 +1038,7 @@ void task_new_game_prof_birch_speech_3(u8 taskId) { InitWindows(gUnknown_082FF080); LoadMainMenuWindowFrameTiles(0, 0xF3); - copy_textbox_border_tile_patterns_to_vram(0, 0xFC, 0xF0); + LoadMessageBoxGfx(0, 0xFC, 0xF0); unknown_rbox_to_vram(0, 1); PutWindowTilemap(0); CopyWindowToVram(0, 2); @@ -1565,7 +1565,7 @@ void new_game_prof_birch_speech_part2_start(void) SetMainCallback2(CB2_MainMenu); InitWindows(gUnknown_082FF080); LoadMainMenuWindowFrameTiles(0, 0xF3); - copy_textbox_border_tile_patterns_to_vram(0, 0xFC, 0xF0); + LoadMessageBoxGfx(0, 0xFC, 0xF0); PutWindowTilemap(0); CopyWindowToVram(0, 3); } diff --git a/src/menu.c b/src/menu.c index dedfcc3be..79c70e619 100644 --- a/src/menu.c +++ b/src/menu.c @@ -193,8 +193,8 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP void sub_81973A4(void) { - copy_textbox_border_tile_patterns_to_vram(0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); - sub_809882C(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10); + LoadMessageBoxGfx(0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); + LoadSav2WindowGfx(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10); } void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram) @@ -412,7 +412,7 @@ void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram) void sub_819786C(u8 windowId, bool8 copyToVram) { - copy_textbox_border_tile_patterns_to_vram(windowId, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); + LoadMessageBoxGfx(windowId, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10); sub_8197B1C(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF); } diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 8a7671c5b..c7247b696 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -77,7 +77,7 @@ void CB2_InitMysteryEventMenu(void) FillWindowPixelBuffer(i, 0); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); - sub_809882C(0, 1u, 0xD0u); + LoadSav2WindowGfx(0, 1u, 0xD0u); sub_81978B0(0xE0); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON); SetGpuReg(REG_OFFSET_BLDCNT, 0); diff --git a/src/pokeblock.c b/src/pokeblock.c index 216c9e2c5..518acd792 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -75,8 +75,8 @@ extern const u16 gUnknown_0860F074[]; extern void CB2_ReturnToField(void); extern bool8 sub_81221EC(void); -extern void sub_809882C(u8, u16, u8); -extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); +extern void LoadSav2WindowGfx(u8, u16, u8); +extern void LoadMessageBoxGfx(u8, u16, u8); extern void sub_80AF168(void); // this file's functions @@ -566,8 +566,8 @@ static void HandleInitWindows(void) InitWindows(sWindowTemplatesForPokeblockMenu); DeactivateAllTextPrinters(); - sub_809882C(0, 1, 0xE0); - copy_textbox_border_tile_patterns_to_vram(0, 0xA, 0xD0); + LoadSav2WindowGfx(0, 1, 0xE0); + LoadMessageBoxGfx(0, 0xA, 0xD0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); for (i = 0; i < ARRAY_COUNT(sWindowTemplatesForPokeblockMenu) - 1; i++) diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index db92d56a8..d3fdbd355 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -59,7 +59,7 @@ extern const u16 gUnknown_0860F074[]; extern bool8 sub_81221EC(void); extern void sub_806A068(u16, u8); -extern void sub_809882C(u8, u16, u8); +extern void LoadSav2WindowGfx(u8, u16, u8); // this file's functions static void HandleInitBackgrounds(void); @@ -706,7 +706,7 @@ static void HandleInitWindows(void) { InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - sub_809882C(0, 1, 0xE0); + LoadSav2WindowGfx(0, 1, 0xE0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); FillWindowPixelBuffer(0, 0); PutWindowTilemap(0); diff --git a/src/region_map.c b/src/region_map.c index f16787fc9..0a6c08234 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1603,7 +1603,7 @@ void MCB2_FlyMap(void) gMain.state++; break; case 3: - sub_809882C(0, 0x65, 0xd0); + LoadSav2WindowGfx(0, 0x65, 0xd0); clear_scheduled_bg_copies_to_vram(); gMain.state++; break; diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 45f0f5a9e..4456e450c 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -58,7 +58,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void) { case 0: ScanlineEffect_Clear(); - sub_8035658(); + BattleInitBgsAndWindows(); SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); ShowBg(0); diff --git a/src/scrcmd.c b/src/scrcmd.c index 4e3fceb10..a09e911f0 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1517,7 +1517,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) winTemplate = sub_8198A50(0, xWindow, yWindow + 1, width, height, 0xF, 0x1); gUnknown_03000F30 = AddWindow(&winTemplate); - sub_809882C(gUnknown_03000F30, 0x214, 0xE0); + LoadSav2WindowGfx(gUnknown_03000F30, 0x214, 0xE0); NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0); PutWindowTilemap(gUnknown_03000F30); FillWindowPixelBuffer(gUnknown_03000F30, 0x11); diff --git a/src/start_menu.c b/src/start_menu.c index 7080ae6a8..43b4f85f2 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1212,7 +1212,7 @@ static bool32 sub_80A03E4(u8 *par1) ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, sUnknown_085105A8, ARRAY_COUNT(sUnknown_085105A8)); InitWindows(sUnknown_085105AC); - box_border_load_tiles_and_pal(0, 8, 224); + LoadSav2WindowGfx_(0, 8, 224); sub_81978B0(240); break; case 3: diff --git a/src/starter_choose.c b/src/starter_choose.c index 480edbcb7..b2160a5a6 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -46,7 +46,7 @@ extern const u8 gStarterChoose_LabelCoords[][2]; extern const u8 gUnknown_085B1E0C[]; extern const u8 gUnknown_085B1E28[][2]; -extern void sub_809882C(u8, u16, u8); +extern void LoadSav2WindowGfx(u8, u16, u8); extern void ScanlineEffect_Stop(void); extern void clear_scheduled_bg_copies_to_vram(void); extern void dp13_810BB8C(void); @@ -126,7 +126,7 @@ void CB2_ChooseStarter(void) InitWindows(gUnknown_085B1DCC); DeactivateAllTextPrinters(); - sub_809882C(0, 0x2A8, 0xD0); + LoadSav2WindowGfx(0, 0x2A8, 0xD0); clear_scheduled_bg_copies_to_vram(); ScanlineEffect_Stop(); ResetTasks(); diff --git a/src/text_window.c b/src/text_window.c index c3b9f7197..35afc2004 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -91,26 +91,26 @@ const struct TilesPal *GetWindowFrameTilesPal(u8 id) return &sWindowFrames[id]; } -void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset) +void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset) { LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gMessageBox_Gfx, 0x1C0, destOffset); LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20); } -void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset) +void LoadSav2WindowGfx_(u8 windowId, u16 destOffset, u8 palOffset) { - sub_809882C(windowId, destOffset, palOffset); + LoadSav2WindowGfx(windowId, destOffset, palOffset); } -void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset) +void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset) { LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), sWindowFrames[frameId].tiles, 0x120, destOffset); LoadPalette(sWindowFrames[frameId].pal, palOffset, 0x20); } -void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset) +void LoadSav2WindowGfx(u8 windowId, u16 destOffset, u8 palOffset) { - sub_80987D4(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palOffset); + LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palOffset); } void sub_8098858(u8 windowId, u16 tileNum, u8 palNum) diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index c8898d08f..1fb4c411f 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -164,7 +164,7 @@ void sub_8166380(void) InitBgsFromTemplates(0, gUnknown_085DFCCC, ARRAY_COUNT(gUnknown_085DFCCC)); InitWindows(gUnknown_085DFCDC); DeactivateAllTextPrinters(); - sub_809882C(0, 0x97, 0xE0); + LoadSav2WindowGfx(0, 0x97, 0xE0); gUnknown_0203BC90->field_50++; break; case 4: diff --git a/src/wallclock.c b/src/wallclock.c index f15bbbc27..80383c26d 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -576,7 +576,7 @@ static void LoadWallClockGraphics(void) InitBgsFromTemplates(0, gUnknown_085B21FC, 3); InitWindows(gUnknown_085B21DC); DeactivateAllTextPrinters(); - sub_809882C(0, 0x250, 0xd0); + LoadSav2WindowGfx(0, 0x250, 0xd0); clear_scheduled_bg_copies_to_vram(); ScanlineEffect_Stop(); ResetTasks(); -- cgit v1.2.3 From 94752d420769dfc205b3f717c660f33a6eb2b6fb Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 19 Jun 2018 00:43:15 +0200 Subject: document battle bars --- include/battle.h | 4 +- include/battle_gfx_sfx_util.h | 4 +- include/battle_interface.h | 8 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 4 +- src/battle_controller_player_partner.c | 4 +- src/battle_controller_recorded_opponent.c | 2 +- src/battle_controller_recorded_player.c | 2 +- src/battle_controller_wally.c | 2 +- src/battle_controllers.c | 2 +- src/battle_gfx_sfx_util.c | 132 +++--- src/battle_interface.c | 740 +++++++++++++++--------------- src/pokeball.c | 6 +- 15 files changed, 469 insertions(+), 447 deletions(-) diff --git a/include/battle.h b/include/battle.h index bf875ad9d..62caa2cfe 100644 --- a/include/battle.h +++ b/include/battle.h @@ -692,9 +692,9 @@ struct BattleBarInfo { u8 healthboxSpriteId; s32 maxValue; - s32 currentValue; + s32 oldValue; s32 receivedValue; - s32 field_10; + s32 currValue; }; struct BattleSpriteData diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h index e1c6325b6..16253e760 100644 --- a/include/battle_gfx_sfx_util.h +++ b/include/battle_gfx_sfx_util.h @@ -35,7 +35,7 @@ void ClearBehindSubstituteBit(u8 battlerId); void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId); void BattleStopLowHpSound(void); u8 GetMonHPBarLevel(struct Pokemon *mon); -void sub_805EAE8(void); +void HandleBattleLowHpMusicChange(void); void sub_805EB9C(u8 affineMode); void LoadAndCreateEnemyShadowSprites(void); void SpriteCB_SetInvisible(struct Sprite *sprite); @@ -45,6 +45,6 @@ void sub_805EF14(void); void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute); void AllocateMonSpritesGfx(void); void FreeMonSpritesGfx(void); -bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon); +bool32 ShouldPlayNormalMonCry(struct Pokemon *mon); #endif // GUARD_BATTLE_GFX_SFX_UTIL diff --git a/include/battle_interface.h b/include/battle_interface.h index fe8c03f70..b917d2cb3 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -29,12 +29,18 @@ enum #define TAG_HEALTHBOX_OPPONENT1_TILE 0xD701 #define TAG_HEALTHBOX_OPPONENT2_TILE 0xD702 +#define TAG_HEALTHBAR_PLAYER1_TILE 0xD704 +#define TAG_HEALTHBAR_OPPONENT1_TILE 0xD705 +#define TAG_HEALTHBAR_PLAYER2_TILE 0xD706 +#define TAG_HEALTHBAR_OPPONENT2_TILE 0xD707 + #define TAG_HEALTHBOX_SAFARI_TILE 0xD70B #define TAG_STATUS_SUMMARY_BAR_TILE 0xD70C #define TAG_STATUS_SUMMARY_BALLS_TILE 0xD714 #define TAG_HEALTHBOX_PAL 0xD6FF +#define TAG_HEALTHBAR_PAL 0xD704 #define TAG_STATUS_SUMMARY_BAR_PAL 0xD710 #define TAG_STATUS_SUMMARY_BALLS_PAL 0xD712 @@ -68,7 +74,7 @@ void SwapHpBarsWithHpText(void); u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart); void sub_8073C30(u8 taskId); void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId); -s32 sub_8074AA0(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3); +s32 MoveBattleBar(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3); u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale); u8 GetHPBarLevel(s16 hp, s16 maxhp); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 905e957ea..b2c05664b 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -395,7 +395,7 @@ static void sub_8064B04(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 3178bad0e..f7abe589a 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -279,7 +279,7 @@ static void sub_814B290(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index ae407af24..21b45dabf 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -391,7 +391,7 @@ static void sub_805F994(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); if (hpValue != -1) { diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 627b13e22..599ebfee4 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1120,7 +1120,7 @@ void c3_0802FDF4(u8 taskId) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); @@ -1224,7 +1224,7 @@ static void sub_8059400(u8 taskId) u8 battlerId = gTasks[taskId].tExpTask_bank; s16 r4; - r4 = sub_8074AA0(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); + r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); if (r4 == -1) { diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 25eef4c5c..df075522e 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -294,7 +294,7 @@ static void sub_81BB1D4(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); @@ -399,7 +399,7 @@ static void sub_81BB4E4(u8 taskId) u8 battlerId = gTasks[taskId].tExpTask_bank; s16 r4; - r4 = sub_8074AA0(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); + r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); if (r4 == -1) { diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index b4bdfaa4e..69f93d7e2 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -377,7 +377,7 @@ static void sub_8186C48(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 24cb58ea4..54ca4578b 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -363,7 +363,7 @@ static void sub_818A064(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index e8efb404f..955799ee3 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -349,7 +349,7 @@ static void sub_8168818(void) static void CompleteOnHealthbarDone(void) { - s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); + s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 2b918d018..8a7ff7b5d 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -587,7 +587,7 @@ static void SetBattlePartyIds(void) { for (i = 0; i < gBattlersCount; i++) { - for (j = 0; j < 6; j++) + for (j = 0; j < PARTY_SIZE; j++) { if (i < 2) { diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index d2c242553..47af1b9dd 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -67,7 +67,7 @@ static void sub_805D7EC(struct Sprite *sprite); static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId); static void Task_ClearBitWhenBattleTableAnimDone(u8 taskId); static void Task_ClearBitWhenSpecialAnimDone(u8 taskId); -static void ClearSpritesBankHealthboxAnimData(void); +static void ClearSpritesBattlerHealthboxAnimData(void); // const rom data static const struct CompressedSpriteSheet gUnknown_0832C0D0 = @@ -411,35 +411,35 @@ void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status) #define tBattlerId data[0] -bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId, u16 argument) +bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId, u16 argument) { u8 taskId; if (tableId == B_ANIM_CASTFORM_CHANGE && (argument & 0x80)) { - gBattleMonForms[activeBank] = (argument & ~(0x80)); + gBattleMonForms[activeBattler] = (argument & ~(0x80)); return TRUE; } - if (gBattleSpritesDataPtr->battlerData[activeBank].behindSubstitute + if (gBattleSpritesDataPtr->battlerData[activeBattler].behindSubstitute && !ShouldAnimBeDoneRegardlessOfSubsitute(tableId)) { return TRUE; } - if (gBattleSpritesDataPtr->battlerData[activeBank].behindSubstitute + if (gBattleSpritesDataPtr->battlerData[activeBattler].behindSubstitute && tableId == B_ANIM_SUBSTITUTE_FADE - && gSprites[gBattlerSpriteIds[activeBank]].invisible) + && gSprites[gBattlerSpriteIds[activeBattler]].invisible) { - LoadBattleMonGfxAndAnimate(activeBank, TRUE, gBattlerSpriteIds[activeBank]); - ClearBehindSubstituteBit(activeBank); + LoadBattleMonGfxAndAnimate(activeBattler, TRUE, gBattlerSpriteIds[activeBattler]); + ClearBehindSubstituteBit(activeBattler); return TRUE; } - gBattleAnimAttacker = atkBank; - gBattleAnimTarget = defBank; + gBattleAnimAttacker = atkBattler; + gBattleAnimTarget = defBattler; gBattleSpritesDataPtr->animationData->animArg = argument; LaunchBattleAnimation(gBattleAnims_VariousTable, tableId, FALSE); taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10); - gTasks[taskId].tBattlerId = activeBank; + gTasks[taskId].tBattlerId = activeBattler; gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].animFromTableActive = 1; return FALSE; @@ -475,15 +475,15 @@ static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId) #define tBattlerId data[0] -void InitAndLaunchSpecialAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId) +void InitAndLaunchSpecialAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId) { u8 taskId; - gBattleAnimAttacker = atkBank; - gBattleAnimTarget = defBank; + gBattleAnimAttacker = atkBattler; + gBattleAnimTarget = defBattler; LaunchBattleAnimation(gBattleAnims_Special, tableId, FALSE); taskId = CreateTask(Task_ClearBitWhenSpecialAnimDone, 10); - gTasks[taskId].tBattlerId = activeBank; + gTasks[taskId].tBattlerId = activeBattler; gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].specialAnimActive = 1; } @@ -681,7 +681,7 @@ void FreeTrainerFrontPicPalette(u16 frontPicId) void sub_805DFFC(void) { - u8 numberOfBanks = 0; + u8 numberOfBattlers = 0; u8 i; LoadSpritePalette(&gUnknown_0832C128[0]); @@ -690,7 +690,7 @@ void sub_805DFFC(void) { LoadCompressedObjectPic(&gUnknown_0832C0D0); LoadCompressedObjectPic(&gUnknown_0832C0D8); - numberOfBanks = 2; + numberOfBattlers = 2; } else { @@ -698,9 +698,9 @@ void sub_805DFFC(void) LoadCompressedObjectPic(&gUnknown_0832C0E0[1]); LoadCompressedObjectPic(&gUnknown_0832C0F0[0]); LoadCompressedObjectPic(&gUnknown_0832C0F0[1]); - numberOfBanks = 4; + numberOfBattlers = 4; } - for (i = 0; i < numberOfBanks; i++) + for (i = 0; i < numberOfBattlers; i++) LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[i]]); } @@ -771,7 +771,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *battlerId) switch (*state1) { case 0: - ClearSpritesBankHealthboxAnimData(); + ClearSpritesBattlerHealthboxAnimData(); (*state1)++; break; case 1: @@ -849,7 +849,7 @@ void ClearSpritesHealthboxAnimData(void) memset(gBattleSpritesDataPtr->animationData, 0, sizeof(struct BattleAnimationInfo)); } -static void ClearSpritesBankHealthboxAnimData(void) +static void ClearSpritesBattlerHealthboxAnimData(void) { ClearSpritesHealthboxAnimData(); memset(gBattleSpritesDataPtr->battlerData, 0, sizeof(struct BattleSpriteInfo) * MAX_BATTLERS_COUNT); @@ -868,7 +868,7 @@ void CopyBattleSpriteInvisibility(u8 battlerId) gBattleSpritesDataPtr->battlerData[battlerId].invisible = gSprites[gBattlerSpriteIds[battlerId]].invisible; } -void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform) +void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform) { u16 paletteOffset; u32 personalityValue; @@ -878,16 +878,16 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform) if (notTransform) { - StartSpriteAnim(&gSprites[gBattlerSpriteIds[bankAtk]], gBattleSpritesDataPtr->animationData->animArg); - paletteOffset = 0x100 + bankAtk * 16; + StartSpriteAnim(&gSprites[gBattlerSpriteIds[battlerAtk]], gBattleSpritesDataPtr->animationData->animArg); + paletteOffset = 0x100 + battlerAtk * 16; LoadPalette(gBattleStruct->castformPalette[gBattleSpritesDataPtr->animationData->animArg], paletteOffset, 32); - gBattleMonForms[bankAtk] = gBattleSpritesDataPtr->animationData->animArg; - if (gBattleSpritesDataPtr->battlerData[bankAtk].transformSpecies != SPECIES_NONE) + gBattleMonForms[battlerAtk] = gBattleSpritesDataPtr->animationData->animArg; + if (gBattleSpritesDataPtr->battlerData[battlerAtk].transformSpecies != SPECIES_NONE) { BlendPalette(paletteOffset, 16, 6, RGB_WHITE); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } - gSprites[gBattlerSpriteIds[bankAtk]].pos1.y = GetBattlerSpriteDefault_Y(bankAtk); + gSprites[gBattlerSpriteIds[battlerAtk]].pos1.y = GetBattlerSpriteDefault_Y(battlerAtk); } else { @@ -909,48 +909,48 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform) } else { - position = GetBattlerPosition(bankAtk); + position = GetBattlerPosition(battlerAtk); - if (GetBattlerSide(bankDef) == B_SIDE_OPPONENT) - targetSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bankDef]], MON_DATA_SPECIES); + if (GetBattlerSide(battlerDef) == B_SIDE_OPPONENT) + targetSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerDef]], MON_DATA_SPECIES); else - targetSpecies = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bankDef]], MON_DATA_SPECIES); + targetSpecies = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerDef]], MON_DATA_SPECIES); - if (GetBattlerSide(bankAtk) == B_SIDE_PLAYER) + if (GetBattlerSide(battlerAtk) == B_SIDE_PLAYER) { - personalityValue = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_PERSONALITY); - otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_OT_ID); + personalityValue = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_PERSONALITY); + otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_OT_ID); HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[targetSpecies], gMonSpritesGfxPtr->sprites[position], targetSpecies, - gTransformedPersonalities[bankAtk]); + gTransformedPersonalities[battlerAtk]); } else { - personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_PERSONALITY); - otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_OT_ID); + personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_PERSONALITY); + otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_OT_ID); HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[targetSpecies], gMonSpritesGfxPtr->sprites[position], targetSpecies, - gTransformedPersonalities[bankAtk]); + gTransformedPersonalities[battlerAtk]); } } src = gMonSpritesGfxPtr->sprites[position]; - dst = (void *)(VRAM + 0x10000 + gSprites[gBattlerSpriteIds[bankAtk]].oam.tileNum * 32); + dst = (void *)(VRAM + 0x10000 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32); DmaCopy32(3, src, dst, 0x800); - paletteOffset = 0x100 + bankAtk * 16; + paletteOffset = 0x100 + battlerAtk * 16; lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue); LZDecompressWram(lzPaletteData, gDecompressionBuffer); LoadPalette(gDecompressionBuffer, paletteOffset, 32); if (targetSpecies == SPECIES_CASTFORM) { - gSprites[gBattlerSpriteIds[bankAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies]; + gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies]; LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]); - LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[bankDef] * 16, paletteOffset, 32); + LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[battlerDef] * 16, paletteOffset, 32); } BlendPalette(paletteOffset, 16, 6, RGB_WHITE); @@ -958,12 +958,12 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform) if (!IsContest()) { - gBattleSpritesDataPtr->battlerData[bankAtk].transformSpecies = targetSpecies; - gBattleMonForms[bankAtk] = gBattleMonForms[bankDef]; + gBattleSpritesDataPtr->battlerData[battlerAtk].transformSpecies = targetSpecies; + gBattleMonForms[battlerAtk] = gBattleMonForms[battlerDef]; } - gSprites[gBattlerSpriteIds[bankAtk]].pos1.y = GetBattlerSpriteDefault_Y(bankAtk); - StartSpriteAnim(&gSprites[gBattlerSpriteIds[bankAtk]], gBattleMonForms[bankAtk]); + gSprites[gBattlerSpriteIds[battlerAtk]].pos1.y = GetBattlerSpriteDefault_Y(battlerAtk); + StartSpriteAnim(&gSprites[gBattlerSpriteIds[battlerAtk]], gBattleMonForms[battlerAtk]); } } @@ -1068,11 +1068,11 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) void BattleStopLowHpSound(void) { - u8 playerBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + u8 playerBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); - gBattleSpritesDataPtr->battlerData[playerBank].lowHpSong = 0; + gBattleSpritesDataPtr->battlerData[playerBattler].lowHpSong = 0; if (IsDoubleBattle()) - gBattleSpritesDataPtr->battlerData[playerBank ^ BIT_FLANK].lowHpSong = 0; + gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0; m4aSongNumStop(SE_HINSI); } @@ -1085,19 +1085,19 @@ u8 GetMonHPBarLevel(struct Pokemon *mon) return GetHPBarLevel(hp, maxHP); } -void sub_805EAE8(void) +void HandleBattleLowHpMusicChange(void) { if (gMain.inBattle) { - u8 playerBank1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); - u8 playerBank2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); - u8 bank1PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBank1]); - u8 bank2PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBank2]); - - if (GetMonData(&gPlayerParty[bank1PartyId], MON_DATA_HP) != 0) - HandleLowHpMusicChange(&gPlayerParty[bank1PartyId], playerBank1); - if (IsDoubleBattle() && GetMonData(&gPlayerParty[bank2PartyId], MON_DATA_HP) != 0) - HandleLowHpMusicChange(&gPlayerParty[bank2PartyId], playerBank2); + u8 playerBattler1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + u8 playerBattler2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); + u8 battler1PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBattler1]); + u8 battler2PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBattler2]); + + if (GetMonData(&gPlayerParty[battler1PartyId], MON_DATA_HP) != 0) + HandleLowHpMusicChange(&gPlayerParty[battler1PartyId], playerBattler1); + if (IsDoubleBattle() && GetMonData(&gPlayerParty[battler2PartyId], MON_DATA_HP) != 0) + HandleLowHpMusicChange(&gPlayerParty[battler2PartyId], playerBattler2); } } @@ -1147,14 +1147,14 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite) { bool8 invisible = FALSE; u8 battlerId = shadowSprite->tBattlerId; - struct Sprite *bankSprite = &gSprites[gBattlerSpriteIds[battlerId]]; + struct Sprite *battlerSprite = &gSprites[gBattlerSpriteIds[battlerId]]; - if (!bankSprite->inUse || !IsBattlerSpritePresent(battlerId)) + if (!battlerSprite->inUse || !IsBattlerSpritePresent(battlerId)) { shadowSprite->callback = SpriteCB_SetInvisible; return; } - if (gAnimScriptActive || bankSprite->invisible) + if (gAnimScriptActive || battlerSprite->invisible) invisible = TRUE; else if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE && gEnemyMonElevation[gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies] == 0) @@ -1163,8 +1163,8 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite) if (gBattleSpritesDataPtr->battlerData[battlerId].behindSubstitute) invisible = TRUE; - shadowSprite->pos1.x = bankSprite->pos1.x; - shadowSprite->pos2.x = bankSprite->pos2.x; + shadowSprite->pos1.x = battlerSprite->pos1.x; + shadowSprite->pos2.x = battlerSprite->pos2.x; shadowSprite->invisible = invisible; } @@ -1177,7 +1177,7 @@ void SpriteCB_SetInvisible(struct Sprite *sprite) void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species) { - // The player's shadow is never seen + // The player's shadow is never seen. if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) return; @@ -1270,7 +1270,7 @@ void FreeMonSpritesGfx(void) FREE_AND_SET_NULL(gMonSpritesGfxPtr); } -bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon) +bool32 ShouldPlayNormalMonCry(struct Pokemon *mon) { s16 hp, maxHP; s32 barLevel; diff --git a/src/battle_interface.c b/src/battle_interface.c index 9ef45020d..94b5a2be9 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -26,7 +26,7 @@ struct TestingBar { s32 maxValue; - s32 currValue; + s32 oldValue; s32 receivedValue; u32 unkC_0:5; u32 unk10; @@ -37,7 +37,7 @@ enum HEALTHBOX_GFX_0, HEALTHBOX_GFX_1, HEALTHBOX_GFX_2, - HEALTHBOX_GFX_3, + HEALTHBOX_GFX_HP_BAR_GREEN, HEALTHBOX_GFX_4, HEALTHBOX_GFX_5, HEALTHBOX_GFX_6, @@ -55,19 +55,19 @@ enum HEALTHBOX_GFX_18, HEALTHBOX_GFX_19, HEALTHBOX_GFX_20, - HEALTHBOX_GFX_STATUS_PSN_BANK0, + HEALTHBOX_GFX_STATUS_PSN_BATTLER0, HEALTHBOX_GFX_22, HEALTHBOX_GFX_23, - HEALTHBOX_GFX_STATUS_PRZ_BANK0, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, HEALTHBOX_GFX_25, HEALTHBOX_GFX_26, - HEALTHBOX_GFX_STATUS_SLP_BANK0, + HEALTHBOX_GFX_STATUS_SLP_BATTLER0, HEALTHBOX_GFX_28, HEALTHBOX_GFX_29, - HEALTHBOX_GFX_STATUS_FRZ_BANK0, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, HEALTHBOX_GFX_31, HEALTHBOX_GFX_32, - HEALTHBOX_GFX_STATUS_BRN_BANK0, + HEALTHBOX_GFX_STATUS_BRN_BATTLER0, HEALTHBOX_GFX_34, HEALTHBOX_GFX_35, HEALTHBOX_GFX_36, @@ -81,7 +81,7 @@ enum HEALTHBOX_GFX_44, HEALTHBOX_GFX_45, HEALTHBOX_GFX_46, - HEALTHBOX_GFX_47, + HEALTHBOX_GFX_HP_BAR_YELLOW, HEALTHBOX_GFX_48, HEALTHBOX_GFX_49, HEALTHBOX_GFX_50, @@ -90,7 +90,7 @@ enum HEALTHBOX_GFX_53, HEALTHBOX_GFX_54, HEALTHBOX_GFX_55, - HEALTHBOX_GFX_56, + HEALTHBOX_GFX_HP_BAR_RED, HEALTHBOX_GFX_57, HEALTHBOX_GFX_58, HEALTHBOX_GFX_59, @@ -105,56 +105,56 @@ enum HEALTHBOX_GFX_68, HEALTHBOX_GFX_69, HEALTHBOX_GFX_70, - HEALTHBOX_GFX_STATUS_PSN_BANK1, + HEALTHBOX_GFX_STATUS_PSN_BATTLER1, HEALTHBOX_GFX_72, HEALTHBOX_GFX_73, - HEALTHBOX_GFX_STATUS_PRZ_BANK1, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, HEALTHBOX_GFX_75, HEALTHBOX_GFX_76, - HEALTHBOX_GFX_STATUS_SLP_BANK1, + HEALTHBOX_GFX_STATUS_SLP_BATTLER1, HEALTHBOX_GFX_78, HEALTHBOX_GFX_79, - HEALTHBOX_GFX_STATUS_FRZ_BANK1, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, HEALTHBOX_GFX_81, HEALTHBOX_GFX_82, - HEALTHBOX_GFX_STATUS_BRN_BANK1, + HEALTHBOX_GFX_STATUS_BRN_BATTLER1, HEALTHBOX_GFX_84, HEALTHBOX_GFX_85, - HEALTHBOX_GFX_STATUS_PSN_BANK2, + HEALTHBOX_GFX_STATUS_PSN_BATTLER2, HEALTHBOX_GFX_87, HEALTHBOX_GFX_88, - HEALTHBOX_GFX_STATUS_PRZ_BANK2, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, HEALTHBOX_GFX_90, HEALTHBOX_GFX_91, - HEALTHBOX_GFX_STATUS_SLP_BANK2, + HEALTHBOX_GFX_STATUS_SLP_BATTLER2, HEALTHBOX_GFX_93, HEALTHBOX_GFX_94, - HEALTHBOX_GFX_STATUS_FRZ_BANK2, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, HEALTHBOX_GFX_96, HEALTHBOX_GFX_97, - HEALTHBOX_GFX_STATUS_BRN_BANK2, + HEALTHBOX_GFX_STATUS_BRN_BATTLER2, HEALTHBOX_GFX_99, HEALTHBOX_GFX_100, - HEALTHBOX_GFX_STATUS_PSN_BANK3, + HEALTHBOX_GFX_STATUS_PSN_BATTLER3, HEALTHBOX_GFX_102, HEALTHBOX_GFX_103, - HEALTHBOX_GFX_STATUS_PRZ_BANK3, + HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, HEALTHBOX_GFX_105, HEALTHBOX_GFX_106, - HEALTHBOX_GFX_STATUS_SLP_BANK3, + HEALTHBOX_GFX_STATUS_SLP_BATTLER3, HEALTHBOX_GFX_108, HEALTHBOX_GFX_109, - HEALTHBOX_GFX_STATUS_FRZ_BANK3, + HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, HEALTHBOX_GFX_111, HEALTHBOX_GFX_112, - HEALTHBOX_GFX_STATUS_BRN_BANK3, + HEALTHBOX_GFX_STATUS_BRN_BATTLER3, HEALTHBOX_GFX_114, HEALTHBOX_GFX_115, HEALTHBOX_GFX_116, HEALTHBOX_GFX_117, }; -extern const u8 * const gNatureNamePointers[]; +extern const u8 *const gNatureNamePointers[]; // strings extern const u8 gText_Slash[]; @@ -179,28 +179,28 @@ static void RemoveWindowOnHealthbox(u32 windowId); static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent); static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId); -static void sub_8075198(void *dest, u8 *windowTileData, s32 arg2); -static void sub_80751E4(void *dest, u8 *windowTileData, u32 arg2); -static void sub_8075170(void *dest, u8 *windowTileData, u32 arg2); -static void sub_807513C(void *dest, u32 arg1, u32 arg2); +static void TextIntoHealthboxObject(void *dest, u8 *windowTileData, s32 arg2); +static void SafariTextIntoHealthboxObject(void *dest, u8 *windowTileData, u32 arg2); +static void HpTextIntoHealthboxObject(void *dest, u8 *windowTileData, u32 arg2); +static void FillHealthboxObject(void *dest, u32 arg1, u32 arg2); static void sub_8073E08(u8 taskId); static void sub_8073F98(u8 taskId); static void sub_8073E64(u8 taskId); -static void sub_8072924(struct Sprite *sprite); -static void sub_80728B4(struct Sprite *sprite); +static void SpriteCB_HealthBoxOther(struct Sprite *sprite); +static void SpriteCB_HealthBar(struct Sprite *sprite); static void sub_8074158(struct Sprite *sprite); static void sub_8074090(struct Sprite *sprite); static void SpriteCB_StatusSummaryBar(struct Sprite *sprite); static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite); static void SpriteCB_StatusSummaryBallsOnSwitchout(struct Sprite *sprite); -static u8 GetStatusIconForBankId(u8 statusElementId, u8 battlerId); -static s32 sub_8074DB8(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 arg4, u16 arg5); +static u8 GetStatusIconForBattlerId(u8 statusElementId, u8 battlerId); +static s32 CalcNewBarValue(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 arg4, u16 arg5); static u8 GetScaledExpFraction(s32 currValue, s32 receivedValue, s32 maxValue, u8 scale); -static void sub_8074B9C(u8 battlerId, u8 whichBar); -static u8 sub_8074E8C(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 *arg4, u8 arg5); +static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar); +static u8 CalcBarFilledPixels(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *currValue, u8 *arg4, u8 scale); static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2); // const rom data @@ -276,7 +276,7 @@ static const struct SpriteTemplate sHealthboxSafariSpriteTemplate = .callback = SpriteCallbackDummy }; -static const struct OamData sUnknown_0832C1B8 = +static const struct OamData sOamData_Healthbar = { .y = 0, .affineMode = 0, @@ -293,43 +293,43 @@ static const struct OamData sUnknown_0832C1B8 = .affineParam = 0, }; -static const struct SpriteTemplate sUnknown_0832C1C0[4] = +static const struct SpriteTemplate sHealthbarSpriteTemplates[MAX_BATTLERS_COUNT] = { { - .tileTag = 0xd704, - .paletteTag = 0xd704, - .oam = &sUnknown_0832C1B8, + .tileTag = TAG_HEALTHBAR_PLAYER1_TILE, + .paletteTag = TAG_HEALTHBAR_PAL, + .oam = &sOamData_Healthbar, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80728B4 + .callback = SpriteCB_HealthBar }, { - .tileTag = 0xd705, - .paletteTag = 0xd704, - .oam = &sUnknown_0832C1B8, + .tileTag = TAG_HEALTHBAR_OPPONENT1_TILE, + .paletteTag = TAG_HEALTHBAR_PAL, + .oam = &sOamData_Healthbar, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80728B4 + .callback = SpriteCB_HealthBar }, { - .tileTag = 0xd706, - .paletteTag = 0xd704, - .oam = &sUnknown_0832C1B8, + .tileTag = TAG_HEALTHBAR_PLAYER2_TILE, + .paletteTag = TAG_HEALTHBAR_PAL, + .oam = &sOamData_Healthbar, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80728B4 + .callback = SpriteCB_HealthBar }, { - .tileTag = 0xd707, - .paletteTag = 0xd704, - .oam = &sUnknown_0832C1B8, + .tileTag = TAG_HEALTHBAR_OPPONENT2_TILE, + .paletteTag = TAG_HEALTHBAR_PAL, + .oam = &sOamData_Healthbar, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80728B4 + .callback = SpriteCB_HealthBar } }; @@ -883,112 +883,126 @@ void sub_80724A8(s16 arg0, s16 arg1, u16 *arg2) sub_8072308(arg0, arg2 + 5, 1); } -// because the healthbox is too large to fit into one sprite, it is divided into two sprites -// healthboxSpriteId_1 or healthboxSpriteId refers to the 'main' healthbox -// healthboxSpriteId_2 refers to the other part -// there's also one other sprite that appears to be a black square? dont fully understand its role +// Because the healthbox is too large to fit into one sprite, it is divided into two sprites. +// healthboxLeft or healthboxMain is the left part that is used as the 'main' sprite. +// healthboxRight or healthboxOther is the right part of the healthbox. +// There's also the third sprite under name of healthbarSprite that refers to the healthbar visible on the healtbox. -u8 CreateBattlerHealthboxSprites(u8 battler) +// data fields for healthboxMain +// oam.affineParam holds healthboxRight spriteId +#define hMain_HealthBarSpriteId data[5] +#define hMain_Battler data[6] +#define hMain_Data7 data[7] + +// data fields for healthboxRight +#define hOther_HealthBoxSpriteId data[5] + +// data fields for healthbar +#define hBar_HealthBoxSpriteId data[5] +#define hBar_Data6 data[6] + +u8 CreateBattlerHealthboxSprites(u8 battlerId) { s16 data6 = 0; - u8 healthboxSpriteId_1, healthboxSpriteId_2; - u8 unkSpriteId; - struct Sprite *unkSpritePtr; + u8 healthboxLeftSpriteId, healthboxRightSpriteId; + u8 healthbarSpriteId; + struct Sprite *healthBarSpritePtr; if (!IsDoubleBattle()) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) { - healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1); - gSprites[healthboxSpriteId_1].oam.shape = 0; + gSprites[healthboxLeftSpriteId].oam.shape = 0; - gSprites[healthboxSpriteId_2].oam.shape = 0; - gSprites[healthboxSpriteId_2].oam.tileNum += 64; + gSprites[healthboxRightSpriteId].oam.shape = 0; + gSprites[healthboxRightSpriteId].oam.tileNum += 64; } else { - healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[0], 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[0], 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxOpponentSpriteTemplates[0], 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[0], 240, 160, 1); - gSprites[healthboxSpriteId_2].oam.tileNum += 32; + gSprites[healthboxRightSpriteId].oam.tileNum += 32; data6 = 2; } - gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2; - gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1; - gSprites[healthboxSpriteId_2].callback = sub_8072924; + gSprites[healthboxLeftSpriteId].oam.affineParam = healthboxRightSpriteId; + + gSprites[healthboxRightSpriteId].hOther_HealthBoxSpriteId = healthboxLeftSpriteId; + gSprites[healthboxRightSpriteId].callback = SpriteCB_HealthBoxOther; } else { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) { - healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battlerId) / 2], 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battlerId) / 2], 240, 160, 1); - gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2; + gSprites[healthboxLeftSpriteId].oam.affineParam = healthboxRightSpriteId; - gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1; - gSprites[healthboxSpriteId_2].oam.tileNum += 32; - gSprites[healthboxSpriteId_2].callback = sub_8072924; + gSprites[healthboxRightSpriteId].hOther_HealthBoxSpriteId = healthboxLeftSpriteId; + gSprites[healthboxRightSpriteId].oam.tileNum += 32; + gSprites[healthboxRightSpriteId].callback = SpriteCB_HealthBoxOther; data6 = 1; } else { - healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battlerId) / 2], 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battlerId) / 2], 240, 160, 1); - gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2; + gSprites[healthboxLeftSpriteId].oam.affineParam = healthboxRightSpriteId; - gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1; - gSprites[healthboxSpriteId_2].oam.tileNum += 32; - gSprites[healthboxSpriteId_2].callback = sub_8072924; + gSprites[healthboxRightSpriteId].hOther_HealthBoxSpriteId = healthboxLeftSpriteId; + gSprites[healthboxRightSpriteId].oam.tileNum += 32; + gSprites[healthboxRightSpriteId].callback = SpriteCB_HealthBoxOther; data6 = 2; } } - unkSpriteId = CreateSpriteAtEnd(&sUnknown_0832C1C0[gBattlerPositions[battler]], 140, 60, 0); - unkSpritePtr = &gSprites[unkSpriteId]; - SetSubspriteTables(unkSpritePtr, &sUnknown_0832C28C[GetBattlerSide(battler)]); - unkSpritePtr->subspriteMode = 2; - unkSpritePtr->oam.priority = 1; + healthbarSpriteId = CreateSpriteAtEnd(&sHealthbarSpriteTemplates[gBattlerPositions[battlerId]], 140, 60, 0); + healthBarSpritePtr = &gSprites[healthbarSpriteId]; + SetSubspriteTables(healthBarSpritePtr, &sUnknown_0832C28C[GetBattlerSide(battlerId)]); + healthBarSpritePtr->subspriteMode = 2; + healthBarSpritePtr->oam.priority = 1; - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void*)(OBJ_VRAM0 + unkSpritePtr->oam.tileNum * 32), 64); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void*)(OBJ_VRAM0 + healthBarSpritePtr->oam.tileNum * 32), 64); - gSprites[healthboxSpriteId_1].data[5] = unkSpriteId; - gSprites[healthboxSpriteId_1].data[6] = battler; - gSprites[healthboxSpriteId_1].invisible = 1; + gSprites[healthboxLeftSpriteId].hMain_HealthBarSpriteId = healthbarSpriteId; + gSprites[healthboxLeftSpriteId].hMain_Battler = battlerId; + gSprites[healthboxLeftSpriteId].invisible = 1; - gSprites[healthboxSpriteId_2].invisible = 1; + gSprites[healthboxRightSpriteId].invisible = 1; - unkSpritePtr->data[5] = healthboxSpriteId_1; - unkSpritePtr->data[6] = data6; - unkSpritePtr->invisible = 1; + healthBarSpritePtr->hBar_HealthBoxSpriteId = healthboxLeftSpriteId; + healthBarSpritePtr->hBar_Data6 = data6; + healthBarSpritePtr->invisible = 1; - return healthboxSpriteId_1; + return healthboxLeftSpriteId; } u8 CreateSafariPlayerHealthboxSprites(void) { - u8 healthboxSpriteId_1, healthboxSpriteId_2; + u8 healthboxLeftSpriteId, healthboxRightSpriteId; - healthboxSpriteId_1 = CreateSprite(&sHealthboxSafariSpriteTemplate, 240, 160, 1); - healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxSafariSpriteTemplate, 240, 160, 1); + healthboxLeftSpriteId = CreateSprite(&sHealthboxSafariSpriteTemplate, 240, 160, 1); + healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxSafariSpriteTemplate, 240, 160, 1); - gSprites[healthboxSpriteId_1].oam.shape = 0; - gSprites[healthboxSpriteId_2].oam.shape = 0; + gSprites[healthboxLeftSpriteId].oam.shape = 0; + gSprites[healthboxRightSpriteId].oam.shape = 0; - gSprites[healthboxSpriteId_2].oam.tileNum += 64; + gSprites[healthboxRightSpriteId].oam.tileNum += 64; - gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2; - gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1; + gSprites[healthboxLeftSpriteId].oam.affineParam = healthboxRightSpriteId; + gSprites[healthboxRightSpriteId].hOther_HealthBoxSpriteId = healthboxLeftSpriteId; - gSprites[healthboxSpriteId_2].callback = sub_8072924; + gSprites[healthboxRightSpriteId].callback = SpriteCB_HealthBoxOther; - return healthboxSpriteId_1; + return healthboxLeftSpriteId; } static const u8 *GetHealthboxElementGfxPtr(u8 elementId) @@ -996,62 +1010,63 @@ static const u8 *GetHealthboxElementGfxPtr(u8 elementId) return gHealthboxElementsGfxTable[elementId]; } -static void sub_80728B4(struct Sprite *sprite) +// Syncs the position of healthbar accordingly with the healthbox. +static void SpriteCB_HealthBar(struct Sprite *sprite) { - u8 var = sprite->data[5]; + u8 healthboxSpriteId = sprite->hBar_HealthBoxSpriteId; - switch (sprite->data[6]) + switch (sprite->hBar_Data6) { case 0: - sprite->pos1.x = gSprites[var].pos1.x + 16; - sprite->pos1.y = gSprites[var].pos1.y; + sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 16; + sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y; break; case 1: - sprite->pos1.x = gSprites[var].pos1.x + 16; - sprite->pos1.y = gSprites[var].pos1.y; + sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 16; + sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y; break; case 2: default: - sprite->pos1.x = gSprites[var].pos1.x + 8; - sprite->pos1.y = gSprites[var].pos1.y; + sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 8; + sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y; break; } - sprite->pos2.x = gSprites[var].pos2.x; - sprite->pos2.y = gSprites[var].pos2.y; + sprite->pos2.x = gSprites[healthboxSpriteId].pos2.x; + sprite->pos2.y = gSprites[healthboxSpriteId].pos2.y; } -static void sub_8072924(struct Sprite *sprite) +static void SpriteCB_HealthBoxOther(struct Sprite *sprite) { - u8 otherSpriteId = sprite->data[5]; + u8 healthboxMainSpriteId = sprite->hOther_HealthBoxSpriteId; - sprite->pos1.x = gSprites[otherSpriteId].pos1.x + 64; - sprite->pos1.y = gSprites[otherSpriteId].pos1.y; + sprite->pos1.x = gSprites[healthboxMainSpriteId].pos1.x + 64; + sprite->pos1.y = gSprites[healthboxMainSpriteId].pos1.y; - sprite->pos2.x = gSprites[otherSpriteId].pos2.x; - sprite->pos2.y = gSprites[otherSpriteId].pos2.y; + sprite->pos2.x = gSprites[healthboxMainSpriteId].pos2.x; + sprite->pos2.y = gSprites[healthboxMainSpriteId].pos2.y; } -void SetBattleBarStruct(u8 battlerId, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue) +void SetBattleBarStruct(u8 battlerId, u8 healthboxSpriteId, s32 maxVal, s32 oldVal, s32 receivedValue) { gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId = healthboxSpriteId; gBattleSpritesDataPtr->battleBars[battlerId].maxValue = maxVal; - gBattleSpritesDataPtr->battleBars[battlerId].currentValue = currVal; + gBattleSpritesDataPtr->battleBars[battlerId].oldValue = oldVal; gBattleSpritesDataPtr->battleBars[battlerId].receivedValue = receivedValue; - gBattleSpritesDataPtr->battleBars[battlerId].field_10 = -32768; + gBattleSpritesDataPtr->battleBars[battlerId].currValue = -32768; } void SetHealthboxSpriteInvisible(u8 healthboxSpriteId) { gSprites[healthboxSpriteId].invisible = 1; - gSprites[gSprites[healthboxSpriteId].data[5]].invisible = 1; + gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = 1; gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 1; } void SetHealthboxSpriteVisible(u8 healthboxSpriteId) { gSprites[healthboxSpriteId].invisible = 0; - gSprites[gSprites[healthboxSpriteId].data[5]].invisible = 0; + gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = 0; gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 0; } @@ -1064,11 +1079,11 @@ static void UpdateSpritePos(u8 spriteId, s16 x, s16 y) void DestoryHealthboxSprite(u8 healthboxSpriteId) { DestroySprite(&gSprites[gSprites[healthboxSpriteId].oam.affineParam]); - DestroySprite(&gSprites[gSprites[healthboxSpriteId].data[5]]); + DestroySprite(&gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId]); DestroySprite(&gSprites[healthboxSpriteId]); } -void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBankOnly) +void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBattlerOnly) { } @@ -1079,13 +1094,13 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority) for (i = 0; i < gBattlersCount; i++) { - u8 healthboxSpriteId_1 = gHealthboxSpriteIds[i]; - u8 healthboxSpriteId_2 = gSprites[gHealthboxSpriteIds[i]].oam.affineParam; - u8 healthboxSpriteId_3 = gSprites[gHealthboxSpriteIds[i]].data[5]; + u8 healthboxLeftSpriteId = gHealthboxSpriteIds[i]; + u8 healthboxRightSpriteId = gSprites[gHealthboxSpriteIds[i]].oam.affineParam; + u8 healthbarSpriteId = gSprites[gHealthboxSpriteIds[i]].hMain_HealthBarSpriteId; - gSprites[healthboxSpriteId_1].oam.priority = priority; - gSprites[healthboxSpriteId_2].oam.priority = priority; - gSprites[healthboxSpriteId_3].oam.priority = priority; + gSprites[healthboxLeftSpriteId].oam.priority = priority; + gSprites[healthboxRightSpriteId].oam.priority = priority; + gSprites[healthbarSpriteId].oam.priority = priority; } } @@ -1146,7 +1161,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, xPos, 3, 2, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32; - if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) + if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER) { objVram = (void*)(OBJ_VRAM0); if (!IsDoubleBattle()) @@ -1159,7 +1174,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl) objVram = (void*)(OBJ_VRAM0); objVram += spriteTileNum + 0x400; } - sub_8075198(objVram, windowTileData, 3); + TextIntoHealthboxObject(objVram, windowTileData, 3); RemoveWindowOnHealthbox(windowId); } @@ -1170,7 +1185,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent) u8 text[32]; void *objVram; - if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER && !IsDoubleBattle()) + if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER && !IsDoubleBattle()) { spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32; if (maxOrCurrent != HP_CURRENT) // singles, max @@ -1179,7 +1194,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 0, 5, 2, &windowId); objVram = (void*)(OBJ_VRAM0); objVram += spriteTileNum + 0xB40; - sub_8075170(objVram, windowTileData, 2); + HpTextIntoHealthboxObject(objVram, windowTileData, 2); RemoveWindowOnHealthbox(windowId); } else // singles, current @@ -1190,20 +1205,19 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 4, 5, 2, &windowId); objVram = (void*)(OBJ_VRAM0); objVram += spriteTileNum + 0x3E0; - sub_8075170(objVram, windowTileData, 1); + HpTextIntoHealthboxObject(objVram, windowTileData, 1); objVram = (void*)(OBJ_VRAM0); objVram += spriteTileNum + 0xB00; - sub_8075170(objVram, windowTileData + 0x20, 2); + HpTextIntoHealthboxObject(objVram, windowTileData + 0x20, 2); RemoveWindowOnHealthbox(windowId); } - } else { u8 battler; memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4)); - battler = gSprites[healthboxSpriteId].data[6]; + battler = gSprites[healthboxSpriteId].hMain_Battler; if (IsDoubleBattle() == TRUE || GetBattlerSide(battler) == B_SIDE_OPPONENT) { UpdateHpTextInHealthboxInDoubles(healthboxSpriteId, value, maxOrCurrent); @@ -1248,7 +1262,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 u8 text[32]; void *objVram; - if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) + if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER) { if (gBattleSpritesDataPtr->battlerData[gSprites[healthboxSpriteId].data[6]].hpNumbersNoBars) // don't print text if only bars are visible { @@ -1259,7 +1273,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 { ConvertIntToDecimalStringN(text, value, STR_CONV_MODE_RIGHT_ALIGN, 3); windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 0, 5, 0, &windowId); - sub_8075170((void*)(OBJ_VRAM0) + spriteTileNum + 0xC0, windowTileData, 2); + HpTextIntoHealthboxObject((void*)(OBJ_VRAM0) + spriteTileNum + 0xC0, windowTileData, 2); RemoveWindowOnHealthbox(windowId); CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116), (void*)(OBJ_VRAM0 + 0x680) + (gSprites[healthboxSpriteId].oam.tileNum * 32), @@ -1271,8 +1285,8 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 text[3] = CHAR_SLASH; text[4] = EOS; windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 4, 5, 0, &windowId); - sub_807513C(objVram, 0, 3); - sub_8075170((void*)(OBJ_VRAM0 + 0x60) + spriteTileNum, windowTileData, 3); + FillHealthboxObject(objVram, 0, 3); // Erases HP bar leftover. + HpTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x60) + spriteTileNum, windowTileData, 3); RemoveWindowOnHealthbox(windowId); } } @@ -1282,7 +1296,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 u8 battlerId; memcpy(text, sUnknown_0832C3D8, sizeof(sUnknown_0832C3D8)); - battlerId = gSprites[healthboxSpriteId].data[6]; + battlerId = gSprites[healthboxSpriteId].hMain_Battler; if (gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars) // don't print text if only bars are visible { @@ -1325,7 +1339,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 } else { - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) // impossible to reach part, because the battlerId is from the opponent's side + if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) // Impossible to reach part, because the battlerId is from the opponent's side. { CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116), (void*)(OBJ_VRAM0) + ((gSprites[healthboxSpriteId].oam.tileNum + 52) * 32), @@ -1336,15 +1350,16 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 } } -static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon) +// Prints mon's nature and flee rate. Probably used to test pokeblock feeders. +static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon) { u8 text[20]; s32 j, var2; u8 *barFontGfx; - u8 i, var, nature, healthboxSpriteId_2; + u8 i, var, nature, healthBarSpriteId; memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4)); - barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBattlerPosition(gSprites[healthboxSpriteId].data[6]) * 384)]; + barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBattlerPosition(gSprites[healthboxSpriteId].hMain_Battler) * 384)]; var = 5; nature = GetNature(mon); StringCopy(text + 6, gNatureNamePointers[nature]); @@ -1375,26 +1390,26 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon) barFontGfx += 0x20; } - healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5]; + healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; ConvertIntToDecimalStringN(text + 6, gBattleStruct->field_7C, STR_CONV_MODE_RIGHT_ALIGN, 2); ConvertIntToDecimalStringN(text + 9, gBattleStruct->field_7B, STR_CONV_MODE_RIGHT_ALIGN, 2); text[5] = CHAR_SPACE; text[8] = CHAR_SLASH; RenderTextFont9(gMonSpritesGfxPtr->barFontGfx, 9, text); - j = healthboxSpriteId_2; // needed to match for some reason + j = healthBarSpriteId; // Needed to match for some reason. for (j = 0; j < 5; j++) { if (j <= 1) { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20], - (void*)(OBJ_VRAM0) + (gSprites[healthboxSpriteId_2].oam.tileNum + 2 + j) * 32, + (void*)(OBJ_VRAM0) + (gSprites[healthBarSpriteId].oam.tileNum + 2 + j) * 32, 32); } else { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20], - (void*)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthboxSpriteId_2].oam.tileNum) * 32, + (void*)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthBarSpriteId].oam.tileNum) * 32, 32); } } @@ -1403,7 +1418,7 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon) void SwapHpBarsWithHpText(void) { s32 i; - u8 spriteId; + u8 healthBarSpriteId; for (i = 0; i < gBattlersCount; i++) { @@ -1424,9 +1439,9 @@ void SwapHpBarsWithHpText(void) if (noBars == TRUE) // bars to text { - spriteId = gSprites[gHealthboxSpriteIds[i]].data[5]; + healthBarSpriteId = gSprites[gHealthboxSpriteIds[i]].hMain_HealthBarSpriteId; - CpuFill32(0, (void*)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100); + CpuFill32(0, (void*)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * 32), 0x100); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_HP), HP_CURRENT); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_MAX_HP), HP_MAX); } @@ -1443,13 +1458,14 @@ void SwapHpBarsWithHpText(void) { if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) { - sub_80730D4(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]]); + // Most likely a debug function. + PrintSafariMonInfo(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]]); } else { - spriteId = gSprites[gHealthboxSpriteIds[i]].data[5]; + healthBarSpriteId = gSprites[gHealthboxSpriteIds[i]].hMain_HealthBarSpriteId; - CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100); + CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * 32), 0x100); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gEnemyParty[gBattlerPartyIndexes[i]], MON_DATA_HP), HP_CURRENT); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gEnemyParty[gBattlerPartyIndexes[i]], MON_DATA_MAX_HP), HP_MAX); } @@ -1462,7 +1478,7 @@ void SwapHpBarsWithHpText(void) UpdateHealthboxAttribute(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]], HEALTHBOX_NICK); } } - gSprites[gHealthboxSpriteIds[i]].data[7] ^= 1; + gSprites[gHealthboxSpriteIds[i]].hMain_Data7 ^= 1; } } } @@ -1473,7 +1489,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, s16 bar_X, bar_Y, bar_pos2_X, bar_data0; s32 i, j, var; u8 barSpriteId; - u8 ballIconSpritesIds[6]; + u8 ballIconSpritesIds[PARTY_SIZE]; u8 taskId; if (!arg2 || GetBattlerPosition(battlerId) != B_POSITION_OPPONENT_RIGHT) @@ -1561,7 +1577,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg { @@ -1580,7 +1596,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, } else { - for (i = 0, var = 5, j = 0; j < 6; j++) + for (i = 0, var = 5, j = 0; j < PARTY_SIZE; j++) { if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg { @@ -1609,7 +1625,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS)) { - for (var = 5, i = 0; i < 6; i++) + for (var = 5, i = 0; i < PARTY_SIZE; i++) { if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg { @@ -1629,7 +1645,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, } else { - for (var = 0, i = 0, j = 0; j < 6; j++) + for (var = 0, i = 0, j = 0; j < PARTY_SIZE; j++) { if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg { @@ -1659,7 +1675,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, gTasks[taskId].data[0] = battlerId; gTasks[taskId].data[1] = barSpriteId; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) gTasks[taskId].data[3 + i] = ballIconSpritesIds[i]; gTasks[taskId].data[10] = isBattleStart; @@ -1677,12 +1693,12 @@ void sub_8073C30(u8 taskId) { u8 sp[6]; u8 r7; - u8 r10; + u8 summaryBarSpriteId; u8 battlerId; s32 i; r7 = gTasks[taskId].data[10]; - r10 = gTasks[taskId].data[1]; + summaryBarSpriteId = gTasks[taskId].data[1]; battlerId = gTasks[taskId].data[0]; for (i = 0; i < 6; i++) @@ -1696,7 +1712,7 @@ void sub_8073C30(u8 taskId) for (i = 0; i < 6; i++) gSprites[sp[i]].oam.objMode = 1; - gSprites[r10].oam.objMode = 1; + gSprites[summaryBarSpriteId].oam.objMode = 1; if (r7 != 0) { @@ -1717,10 +1733,10 @@ void sub_8073C30(u8 taskId) gSprites[sp[i]].callback = sub_8074158; } } - gSprites[r10].data[0] /= 2; - gSprites[r10].data[1] = 0; - gSprites[r10].callback = sub_8074090; - SetSubspriteTables(&gSprites[r10], sUnknown_0832C2CC); + gSprites[summaryBarSpriteId].data[0] /= 2; + gSprites[summaryBarSpriteId].data[1] = 0; + gSprites[summaryBarSpriteId].callback = sub_8074090; + SetSubspriteTables(&gSprites[summaryBarSpriteId], sUnknown_0832C2CC); gTasks[taskId].func = sub_8073E08; } else @@ -1754,7 +1770,7 @@ static void sub_8073E64(u8 taskId) gTasks[taskId].data[15]--; if (gTasks[taskId].data[15] == -1) { - u8 var = gTasks[taskId].data[1]; + u8 summaryBarSpriteId = gTasks[taskId].data[1]; for (i = 0; i < 6; i++) sp[i] = gTasks[taskId].data[3 + i]; @@ -1762,13 +1778,13 @@ static void sub_8073E64(u8 taskId) gBattleSpritesDataPtr->animationData->field_9_x1C--; if (!gBattleSpritesDataPtr->animationData->field_9_x1C) { - DestroySpriteAndFreeResources(&gSprites[var]); + DestroySpriteAndFreeResources(&gSprites[summaryBarSpriteId]); DestroySpriteAndFreeResources(&gSprites[sp[0]]); } else { - FreeSpriteOamMatrix(&gSprites[var]); - DestroySprite(&gSprites[var]); + FreeSpriteOamMatrix(&gSprites[summaryBarSpriteId]); + DestroySprite(&gSprites[summaryBarSpriteId]); FreeSpriteOamMatrix(&gSprites[sp[0]]); DestroySprite(&gSprites[sp[0]]); } @@ -1798,12 +1814,12 @@ static void sub_8073F98(u8 taskId) } else if (gTasks[taskId].data[15] == -1) { - u8 var = gTasks[taskId].data[1]; + u8 summaryBarSpriteId = gTasks[taskId].data[1]; for (i = 0; i < 6; i++) sp[i] = gTasks[taskId].data[3 + i]; - DestroySpriteAndFreeResources(&gSprites[var]); + DestroySpriteAndFreeResources(&gSprites[summaryBarSpriteId]); DestroySpriteAndFreeResources(&gSprites[sp[0]]); for (i = 1; i < 6; i++) @@ -1956,17 +1972,17 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) { - sub_8075198((void*)(0x6010040 + spriteTileNum), windowTileData, 6); + TextIntoHealthboxObject((void*)(VRAM + 0x10040 + spriteTileNum), windowTileData, 6); ptr = (void*)(OBJ_VRAM0); if (!IsDoubleBattle()) ptr += spriteTileNum + 0x800; else ptr += spriteTileNum + 0x400; - sub_8075198(ptr, windowTileData + 0xC0, 1); + TextIntoHealthboxObject(ptr, windowTileData + 0xC0, 1); } else { - sub_8075198((void*)(0x6010020 + spriteTileNum), windowTileData, 7); + TextIntoHealthboxObject((void*)(VRAM + 0x10020 + spriteTileNum), windowTileData, 7); } RemoveWindowOnHealthbox(windowId); @@ -1974,38 +1990,38 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus) { - u8 battlerId, healthboxSpriteId_2; + u8 battlerId, healthBarSpriteId; if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL) return; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) return; - battlerId = gSprites[healthboxSpriteId].data[6]; + battlerId = gSprites[healthboxSpriteId].hMain_Battler; if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) return; if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES)), FLAG_GET_CAUGHT)) return; - healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5]; + healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; if (noStatus) - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_70), (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 8) * 32), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_70), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * 32), 32); else - CpuFill32(0, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 8) * 32), 32); + CpuFill32(0, (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * 32), 32); } static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) { s32 i; - u8 battlerId, healthboxSpriteId_2; + u8 battlerId, healthBarSpriteId; u32 status, pltAdder; const u8 *statusGfxPtr; s16 tileNumAdder; u8 statusPalId; - battlerId = gSprites[healthboxSpriteId].data[6]; - healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5]; + battlerId = gSprites[healthboxSpriteId].hMain_Battler; + healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) { status = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_STATUS); @@ -2022,27 +2038,27 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) if (status & STATUS1_SLEEP) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_SLP_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_SLP_BATTLER0, battlerId)); statusPalId = PAL_STATUS_SLP; } else if (status & STATUS1_PSN_ANY) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_PSN_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_PSN_BATTLER0, battlerId)); statusPalId = PAL_STATUS_PSN; } else if (status & STATUS1_BURN) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_BRN_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_BRN_BATTLER0, battlerId)); statusPalId = PAL_STATUS_BRN; } else if (status & STATUS1_FREEZE) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_FRZ_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, battlerId)); statusPalId = PAL_STATUS_FRZ; } else if (status & STATUS1_PARALYSIS) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_PRZ_BANK0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, battlerId)); statusPalId = PAL_STATUS_PAR; } else @@ -2053,7 +2069,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder + i) * 32), 32); if (!gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars) - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void *)(OBJ_VRAM0 + gSprites[healthboxSpriteId_2].oam.tileNum * 32), 64); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * 32), 64); TryAddPokeballIconToHealthbox(healthboxSpriteId, TRUE); return; @@ -2069,68 +2085,68 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) { if (!gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars) { - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_0), (void*)(OBJ_VRAM0 + gSprites[healthboxSpriteId_2].oam.tileNum * 32), 32); - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_65), (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 1) * 32), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_0), (void*)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * 32), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_65), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 1) * 32), 32); } } TryAddPokeballIconToHealthbox(healthboxSpriteId, FALSE); } -static u8 GetStatusIconForBankId(u8 statusElementId, u8 battlerId) +static u8 GetStatusIconForBattlerId(u8 statusElementId, u8 battlerId) { u8 ret = statusElementId; switch (statusElementId) { - case HEALTHBOX_GFX_STATUS_PSN_BANK0: + case HEALTHBOX_GFX_STATUS_PSN_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_PSN_BANK0; + ret = HEALTHBOX_GFX_STATUS_PSN_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_PSN_BANK1; + ret = HEALTHBOX_GFX_STATUS_PSN_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_PSN_BANK2; + ret = HEALTHBOX_GFX_STATUS_PSN_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_PSN_BANK3; + ret = HEALTHBOX_GFX_STATUS_PSN_BATTLER3; break; - case HEALTHBOX_GFX_STATUS_PRZ_BANK0: + case HEALTHBOX_GFX_STATUS_PRZ_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_PRZ_BANK0; + ret = HEALTHBOX_GFX_STATUS_PRZ_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_PRZ_BANK1; + ret = HEALTHBOX_GFX_STATUS_PRZ_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_PRZ_BANK2; + ret = HEALTHBOX_GFX_STATUS_PRZ_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_PRZ_BANK3; + ret = HEALTHBOX_GFX_STATUS_PRZ_BATTLER3; break; - case HEALTHBOX_GFX_STATUS_SLP_BANK0: + case HEALTHBOX_GFX_STATUS_SLP_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_SLP_BANK0; + ret = HEALTHBOX_GFX_STATUS_SLP_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_SLP_BANK1; + ret = HEALTHBOX_GFX_STATUS_SLP_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_SLP_BANK2; + ret = HEALTHBOX_GFX_STATUS_SLP_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_SLP_BANK3; + ret = HEALTHBOX_GFX_STATUS_SLP_BATTLER3; break; - case HEALTHBOX_GFX_STATUS_FRZ_BANK0: + case HEALTHBOX_GFX_STATUS_FRZ_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_FRZ_BANK0; + ret = HEALTHBOX_GFX_STATUS_FRZ_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_FRZ_BANK1; + ret = HEALTHBOX_GFX_STATUS_FRZ_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_FRZ_BANK2; + ret = HEALTHBOX_GFX_STATUS_FRZ_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_FRZ_BANK3; + ret = HEALTHBOX_GFX_STATUS_FRZ_BATTLER3; break; - case HEALTHBOX_GFX_STATUS_BRN_BANK0: + case HEALTHBOX_GFX_STATUS_BRN_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_BRN_BANK0; + ret = HEALTHBOX_GFX_STATUS_BRN_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_BRN_BANK1; + ret = HEALTHBOX_GFX_STATUS_BRN_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_BRN_BANK2; + ret = HEALTHBOX_GFX_STATUS_BRN_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_BRN_BANK3; + ret = HEALTHBOX_GFX_STATUS_BRN_BATTLER3; break; } return ret; @@ -2143,8 +2159,8 @@ static void UpdateSafariBallsTextOnHealthbox(u8 healthboxSpriteId) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(gText_SafariBalls, 0, 3, 2, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32; - sub_8075198((void*)(OBJ_VRAM0 + 0x40) + spriteTileNum, windowTileData, 6); - sub_8075198((void*)(OBJ_VRAM0 + 0x800) + spriteTileNum, windowTileData + 0xC0, 2); + TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x40) + spriteTileNum, windowTileData, 6); + TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x800) + spriteTileNum, windowTileData + 0xC0, 2); RemoveWindowOnHealthbox(windowId); } @@ -2160,20 +2176,20 @@ static void UpdateLeftNoOfBallsTextOnHealthbox(u8 healthboxSpriteId) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, GetStringRightAlignXOffset(0, text, 0x2F), 3, 2, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32; - sub_80751E4((void*)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2); - sub_80751E4((void*)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4); + SafariTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2); + SafariTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4); RemoveWindowOnHealthbox(windowId); } void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId) { s32 maxHp, currHp; - u8 battlerId = gSprites[healthboxSpriteId].data[6]; + u8 battlerId = gSprites[healthboxSpriteId].hMain_Battler; if (elementId == HEALTHBOX_ALL && !IsDoubleBattle()) - GetBattlerSide(battlerId); // pointless function call + GetBattlerSide(battlerId); // Pointless function call. - if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) + if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER) { u8 isDoubles; @@ -2189,7 +2205,7 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem maxHp = GetMonData(mon, MON_DATA_MAX_HP); currHp = GetMonData(mon, MON_DATA_HP); SetBattleBarStruct(battlerId, healthboxSpriteId, maxHp, currHp, 0); - sub_8074AA0(battlerId, healthboxSpriteId, HEALTH_BAR, 0); + MoveBattleBar(battlerId, healthboxSpriteId, HEALTH_BAR, 0); } isDoubles = IsDoubleBattle(); if (!isDoubles && (elementId == HEALTHBOX_EXP_BAR || elementId == HEALTHBOX_ALL)) @@ -2207,7 +2223,7 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem currExpBarValue = exp - currLevelExp; maxExpBarValue = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLevelExp; SetBattleBarStruct(battlerId, healthboxSpriteId, maxExpBarValue, currExpBarValue, isDoubles); - sub_8074AA0(battlerId, healthboxSpriteId, EXP_BAR, 0); + MoveBattleBar(battlerId, healthboxSpriteId, EXP_BAR, 0); } if (elementId == HEALTHBOX_NICK || elementId == HEALTHBOX_ALL) UpdateNickInHealthbox(healthboxSpriteId, mon); @@ -2228,7 +2244,7 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem maxHp = GetMonData(mon, MON_DATA_MAX_HP); currHp = GetMonData(mon, MON_DATA_HP); SetBattleBarStruct(battlerId, healthboxSpriteId, maxHp, currHp, 0); - sub_8074AA0(battlerId, healthboxSpriteId, HEALTH_BAR, 0); + MoveBattleBar(battlerId, healthboxSpriteId, HEALTH_BAR, 0); } if (elementId == HEALTHBOX_NICK || elementId == HEALTHBOX_ALL) UpdateNickInHealthbox(healthboxSpriteId, mon); @@ -2237,82 +2253,86 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem } } -s32 sub_8074AA0(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 arg3) +#define EXPBAR_PIXELS 64 +#define HEALTHBAR_PIXELS 48 + +s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) { - s32 var; + s32 currentBarValue; if (whichBar == HEALTH_BAR) // health bar { - var = sub_8074DB8(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, - gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + currentBarValue = CalcNewBarValue(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, + gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, - &gBattleSpritesDataPtr->battleBars[battlerId].field_10, - 6, 1); + &gBattleSpritesDataPtr->battleBars[battlerId].currValue, + HEALTHBAR_PIXELS / 8, 1); } else // exp bar { - u16 expFraction = GetScaledExpFraction(gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + u16 expFraction = GetScaledExpFraction(gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, gBattleSpritesDataPtr->battleBars[battlerId].maxValue, 8); if (expFraction == 0) expFraction = 1; expFraction = abs(gBattleSpritesDataPtr->battleBars[battlerId].receivedValue / expFraction); - var = sub_8074DB8(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, - gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + currentBarValue = CalcNewBarValue(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, + gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, - &gBattleSpritesDataPtr->battleBars[battlerId].field_10, - 8, expFraction); + &gBattleSpritesDataPtr->battleBars[battlerId].currValue, + EXPBAR_PIXELS / 8, expFraction); } if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)) - sub_8074B9C(battlerId, whichBar); + MoveBattleBarGraphically(battlerId, whichBar); - if (var == -1) - gBattleSpritesDataPtr->battleBars[battlerId].field_10 = 0; + if (currentBarValue == -1) + gBattleSpritesDataPtr->battleBars[battlerId].currValue = 0; - return var; + return currentBarValue; } -static void sub_8074B9C(u8 battlerId, u8 whichBar) +static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar) { u8 array[8]; - u8 subRet, level; + u8 filledPixelsCount, level; u8 barElementId; u8 i; switch (whichBar) { case HEALTH_BAR: - subRet = sub_8074E8C(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, - gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + filledPixelsCount = CalcBarFilledPixels(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, + gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, - &gBattleSpritesDataPtr->battleBars[battlerId].field_10, - array, 6); - barElementId = 3; - if (subRet <= 0x18) - { - barElementId = 0x38; - if (subRet > 9) - barElementId = 0x2F; - } + &gBattleSpritesDataPtr->battleBars[battlerId].currValue, + array, HEALTHBAR_PIXELS / 8); + + if (filledPixelsCount > (HEALTHBAR_PIXELS * 50 / 100)) // more than 50 % hp + barElementId = HEALTHBOX_GFX_HP_BAR_GREEN; + else if (filledPixelsCount > (HEALTHBAR_PIXELS * 20 / 100)) // more than 20% hp + barElementId = HEALTHBOX_GFX_HP_BAR_YELLOW; + else + barElementId = HEALTHBOX_GFX_HP_BAR_RED; // 20 % or less + for (i = 0; i < 6; i++) { - u8 healthboxSpriteId_2 = gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].data[5]; + u8 healthbarSpriteId = gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].hMain_HealthBarSpriteId; if (i < 2) CpuCopy32(GetHealthboxElementGfxPtr(barElementId) + array[i] * 32, - (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 2 + i) * 32), 32); + (void*)(OBJ_VRAM0 + (gSprites[healthbarSpriteId].oam.tileNum + 2 + i) * 32), 32); else CpuCopy32(GetHealthboxElementGfxPtr(barElementId) + array[i] * 32, - (void*)(OBJ_VRAM0 + 64 + (i + gSprites[healthboxSpriteId_2].oam.tileNum) * 32), 32); + (void*)(OBJ_VRAM0 + 64 + (i + gSprites[healthbarSpriteId].oam.tileNum) * 32), 32); } break; case EXP_BAR: - sub_8074E8C(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, - gBattleSpritesDataPtr->battleBars[battlerId].currentValue, + CalcBarFilledPixels(gBattleSpritesDataPtr->battleBars[battlerId].maxValue, + gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, - &gBattleSpritesDataPtr->battleBars[battlerId].field_10, - array, 8); + &gBattleSpritesDataPtr->battleBars[battlerId].currValue, + array, EXPBAR_PIXELS / 8); level = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_LEVEL); if (level == MAX_MON_LEVEL) { @@ -2332,149 +2352,145 @@ static void sub_8074B9C(u8 battlerId, u8 whichBar) } } -static s32 sub_8074DB8(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 arg4, u16 arg5) +static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *currValue, u8 scale, u16 toAdd) { - s32 r6; - s32 ret; - arg4 <<= 3; + s32 ret, newValue; + scale *= 8; - if (*arg3 == -32768) + if (*currValue == -32768) // first function call { - if (maxValue < arg4) - *arg3 = currValue << 8; + if (maxValue < scale) + *currValue = oldValue << 8; else - *arg3 = currValue; + *currValue = oldValue; } - currValue -= receivedValue; - if (currValue < 0) - currValue = 0; - else if (currValue > maxValue) - currValue = maxValue; + newValue = oldValue - receivedValue; + if (newValue < 0) + newValue = 0; + else if (newValue > maxValue) + newValue = maxValue; - if (maxValue < arg4) + if (maxValue < scale) { - s32 var = *arg3 >> 8; + s32 var = *currValue >> 8; - r6 = *arg3; - if (currValue == var && (r6 & 0xFF) == 0) + if (newValue == var && (*currValue & 0xFF) == 0) return -1; } else { - r6 = *arg3; - if (currValue == r6) + if (newValue == *currValue) // we're done, the bar's value has been updated return -1; } - if (maxValue < arg4) + if (maxValue < scale) // handle cases of max var having less pixels than the whole bar { - s32 var = (maxValue << 8) / arg4; + s32 var = (maxValue << 8) / scale; - if (receivedValue < 0) + if (receivedValue < 0) // fill bar right { - *arg3 = r6 + var; - ret = *arg3 >> 8; - if (ret >= currValue) + *currValue += var; + ret = *currValue >> 8; + if (ret >= newValue) { - *arg3 = currValue << 8; - ret = currValue; + *currValue = newValue << 8; + ret = newValue; } } - else + else // move bar left { - *arg3 = r6 - var; - ret = *arg3 >> 8; - if ((*arg3 & 0xFF) > 0) + *currValue -= var; + ret = *currValue >> 8; + if ((*currValue & 0xFF) > 0) ret++; - if (ret <= currValue) + if (ret <= newValue) { - *arg3 = currValue << 8; - ret = currValue; + *currValue = newValue << 8; + ret = newValue; } } } else { - if (receivedValue < 0) + if (receivedValue < 0) // fill bar right { - *arg3 += arg5; - if (*arg3 > currValue) - *arg3 = currValue; - ret = *arg3; + *currValue += toAdd; + if (*currValue > newValue) + *currValue = newValue; + ret = *currValue; } - else + else // move bar left { - *arg3 -= arg5; - if (*arg3 < currValue) - *arg3 = currValue; - ret = *arg3; + *currValue -= toAdd; + if (*currValue < newValue) + *currValue = newValue; + ret = *currValue; } } return ret; } -static u8 sub_8074E8C(s32 maxValue, s32 currValue, s32 receivedValue, s32 *arg3, u8 *arg4, u8 arg5) +static u8 CalcBarFilledPixels(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *currValue, u8 *arg4, u8 scale) { - s32 r5 = currValue - receivedValue; - u8 ret; + u8 pixels, filledPixels, totalPixels; u8 i; - u8 r2; - if (r5 < 0) - r5 = 0; - else if (r5 > maxValue) - r5 = maxValue; + s32 newValue = oldValue - receivedValue; + if (newValue < 0) + newValue = 0; + else if (newValue > maxValue) + newValue = maxValue; - ret = arg5 << 3; + totalPixels = scale * 8; - for (i = 0; i < arg5; i++) + for (i = 0; i < scale; i++) arg4[i] = 0; - if (maxValue < ret) - r2 = (*arg3 * ret / maxValue) >> 8; + if (maxValue < totalPixels) + pixels = (*currValue * totalPixels / maxValue) >> 8; else - r2 = *arg3 * ret / maxValue; + pixels = *currValue * totalPixels / maxValue; - ret = r2; + filledPixels = pixels; - if (ret == 0 && r5 > 0) + if (filledPixels == 0 && newValue > 0) { arg4[0] = 1; - ret = 1; + filledPixels = 1; } else { - for (i = 0; i < arg5; i++) + for (i = 0; i < scale; i++) { - if (r2 >= 8) + if (pixels >= 8) { arg4[i] = 8; } else { - arg4[i] = r2; + arg4[i] = pixels; break; } - r2 -= 8; + pixels -= 8; } } - return ret; + return filledPixels; } static s16 sub_8074F28(struct TestingBar *barInfo, s32 *arg1, u16 *arg2, s32 arg3) { s16 ret, var; - ret = sub_8074DB8(barInfo->maxValue, - barInfo->currValue, + ret = CalcNewBarValue(barInfo->maxValue, + barInfo->oldValue, barInfo->receivedValue, arg1, 6, 1); sub_8074F88(barInfo, arg1, arg2); - if (barInfo->maxValue < 0x30) + if (barInfo->maxValue < HEALTHBAR_PIXELS) var = *arg1 >> 8; else var = *arg1; @@ -2490,7 +2506,7 @@ static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2) u16 sp10[6]; u8 i; - sub_8074E8C(barInfo->maxValue, barInfo->currValue, + CalcBarFilledPixels(barInfo->maxValue, barInfo->oldValue, barInfo->receivedValue, arg1, sp8, 6); for (i = 0; i < 6; i++) @@ -2499,22 +2515,22 @@ static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2) CpuCopy16(sp10, arg2, sizeof(sp10)); } -static u8 GetScaledExpFraction(s32 currValue, s32 receivedValue, s32 maxValue, u8 scale) +static u8 GetScaledExpFraction(s32 oldValue, s32 receivedValue, s32 maxValue, u8 scale) { - s32 r5, result; - s8 r4, r0; + s32 newVal, result; + s8 oldToMax, newToMax; scale *= 8; - r5 = currValue - receivedValue; + newVal = oldValue - receivedValue; - if (r5 < 0) - r5 = 0; - else if (r5 > maxValue) - r5 = maxValue; + if (newVal < 0) + newVal = 0; + else if (newVal > maxValue) + newVal = maxValue; - r4 = currValue * scale / maxValue; - r0 = r5 * scale / maxValue; - result = r4 - r0; + oldToMax = oldValue * scale / maxValue; + newToMax = newVal * scale / maxValue; + result = oldToMax - newToMax; return abs(result); } @@ -2577,17 +2593,17 @@ static void RemoveWindowOnHealthbox(u32 windowId) RemoveWindow(windowId); } -static void sub_807513C(void *dest, u32 arg1, u32 arg2) +static void FillHealthboxObject(void *dest, u32 arg1, u32 arg2) { CpuFill32(0x11111111 * arg1, dest, arg2 * 32); } -static void sub_8075170(void *dest, u8 *windowTileData, u32 arg2) +static void HpTextIntoHealthboxObject(void *dest, u8 *windowTileData, u32 arg2) { CpuCopy32(windowTileData + 256, dest, arg2 * 32); } -static void sub_8075198(void *dest, u8 *windowTileData, s32 arg2) +static void TextIntoHealthboxObject(void *dest, u8 *windowTileData, s32 arg2) { CpuCopy32(windowTileData + 256, dest + 256, arg2 * 32); @@ -2596,13 +2612,13 @@ static void sub_8075198(void *dest, u8 *windowTileData, s32 arg2) do { CpuCopy32(windowTileData + 20, dest + 20, 12); - dest += 32, windowTileData+= 32; + dest += 32, windowTileData += 32; arg2--; } while (arg2 != 0); } } -static void sub_80751E4(void *dest, u8 *windowTileData, u32 arg2) +static void SafariTextIntoHealthboxObject(void *dest, u8 *windowTileData, u32 arg2) { CpuCopy32(windowTileData, dest, arg2 * 32); CpuCopy32(windowTileData + 256, dest + 256, arg2 * 32); diff --git a/src/pokeball.c b/src/pokeball.c index 8173c4a90..3dbbb2967 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -665,7 +665,7 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) gTasks[taskId].tCryTaskState = wantedCry + 1; break; case 1: - if (ShouldPlayNormalPokeCry(mon) == TRUE) + if (ShouldPlayNormalMonCry(mon) == TRUE) PlayCry3(species, pan, 0); else PlayCry3(species, pan, 11); @@ -680,7 +680,7 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) case 20: if (gTasks[taskId].tCryTaskFrames == 0) { - if (ShouldPlayNormalPokeCry(mon) == TRUE) + if (ShouldPlayNormalMonCry(mon) == TRUE) PlayCry4(species, pan, 1); else PlayCry4(species, pan, 12); @@ -719,7 +719,7 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) gTasks[taskId].tCryTaskFrames--; break; } - if (ShouldPlayNormalPokeCry(mon) == TRUE) + if (ShouldPlayNormalMonCry(mon) == TRUE) PlayCry4(species, pan, 0); else PlayCry4(species, pan, 11); -- cgit v1.2.3 From ab36efdaf4a7f64df9bbfae153eb88cd9c5b29b0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 20 Jun 2018 23:07:51 +0200 Subject: document bounce effect --- include/battle.h | 106 ++++++++-------- include/battle_controllers.h | 8 +- include/battle_main.h | 12 +- include/global.h | 6 + src/battle_controller_link_opponent.c | 8 +- src/battle_controller_link_partner.c | 6 +- src/battle_controller_opponent.c | 8 +- src/battle_controller_player.c | 34 +++--- src/battle_controller_player_partner.c | 6 +- src/battle_controller_recorded_opponent.c | 8 +- src/battle_controller_recorded_player.c | 6 +- src/battle_controller_safari.c | 6 +- src/battle_controller_wally.c | 6 +- src/battle_controllers.c | 10 +- src/battle_interface.c | 197 ++++++++++++++++-------------- src/battle_main.c | 194 +++++++++++++++-------------- src/hall_of_fame.c | 2 +- 17 files changed, 327 insertions(+), 296 deletions(-) diff --git a/include/battle.h b/include/battle.h index 62caa2cfe..2651407fb 100644 --- a/include/battle.h +++ b/include/battle.h @@ -33,7 +33,7 @@ #define B_ACTION_SAFARI_GO_NEAR 7 #define B_ACTION_SAFARI_RUN 8 // The exact purposes of these are unclear -#define B_ACTION_UNKNOWN9 9 +#define B_ACTION_WALLY_THROW 9 #define B_ACTION_EXEC_SCRIPT 10 // when executing an action #define B_ACTION_CANCEL_PARTNER 12 // when choosing an action #define B_ACTION_FINISHED 12 // when executing an action @@ -150,29 +150,29 @@ struct DisableStruct /*0x08*/ u8 protectUses; /*0x09*/ u8 stockpileCounter; /*0x0A*/ u8 substituteHP; - /*0x0B*/ u8 disableTimer1 : 4; - /*0x0B*/ u8 disableTimer2 : 4; + /*0x0B*/ u8 disableTimer1:4; + /*0x0B*/ u8 disableTimer2:4; /*0x0C*/ u8 encoredMovePos; /*0x0D*/ u8 unkD; - /*0x0E*/ u8 encoreTimer1 : 4; - /*0x0E*/ u8 encoreTimer2 : 4; - /*0x0F*/ u8 perishSongTimer1 : 4; - /*0x0F*/ u8 perishSongTimer2 : 4; + /*0x0E*/ u8 encoreTimer1:4; + /*0x0E*/ u8 encoreTimer2:4; + /*0x0F*/ u8 perishSongTimer1:4; + /*0x0F*/ u8 perishSongTimer2:4; /*0x10*/ u8 furyCutterCounter; - /*0x11*/ u8 rolloutCounter1 : 4; - /*0x11*/ u8 rolloutCounter2 : 4; - /*0x12*/ u8 chargeTimer1 : 4; - /*0x12*/ u8 chargeTimer2 : 4; + /*0x11*/ u8 rolloutCounter1:4; + /*0x11*/ u8 rolloutCounter2:4; + /*0x12*/ u8 chargeTimer1:4; + /*0x12*/ u8 chargeTimer2:4; /*0x13*/ u8 tauntTimer1:4; /*0x13*/ u8 tauntTimer2:4; /*0x14*/ u8 battlerPreventingEscape; /*0x15*/ u8 battlerWithSureHit; /*0x16*/ u8 isFirstTurn; /*0x17*/ u8 unk17; - /*0x18*/ u8 truantCounter : 1; - /*0x18*/ u8 truantUnknownBit : 1; - /*0x18*/ u8 unk18_a_2 : 2; - /*0x18*/ u8 unk18_b : 4; + /*0x18*/ u8 truantCounter:1; + /*0x18*/ u8 truantUnknownBit:1; + /*0x18*/ u8 unk18_a_2:2; + /*0x18*/ u8 unk18_b:4; /*0x19*/ u8 rechargeCounter; /*0x1A*/ u8 unk1A[2]; }; @@ -201,12 +201,12 @@ struct ProtectStruct u32 flag2Unknown:1; // 0x2 u32 flinchImmobility:1; // 0x4 u32 notFirstStrike:1; // 0x8 - u32 flag_x10 : 1; // 0x10 - u32 flag_x20 : 1; // 0x20 - u32 flag_x40 : 1; // 0x40 - u32 flag_x80 : 1; // 0x80 + u32 flag_x10:1; // 0x10 + u32 flag_x20:1; // 0x20 + u32 flag_x40:1; // 0x40 + u32 flag_x80:1; // 0x80 /* field_3 */ - u32 field3 : 8; + u32 field3:8; /* field_4 */ u32 physicalDmg; /* field_8 */ u32 specialDmg; @@ -217,14 +217,14 @@ struct ProtectStruct struct SpecialStatus { - u8 statLowered : 1; // 0x1 - u8 lightningRodRedirected : 1; // 0x2 + u8 statLowered:1; // 0x1 + u8 lightningRodRedirected:1; // 0x2 u8 restoredBankSprite: 1; // 0x4 - u8 intimidatedPoke : 1; // 0x8 - u8 traced : 1; // 0x10 - u8 flag20 : 1; - u8 flag40 : 1; - u8 focusBanded : 1; + u8 intimidatedPoke:1; // 0x8 + u8 traced:1; // 0x10 + u8 flag20:1; + u8 flag40:1; + u8 focusBanded:1; u8 field1[3]; s32 dmg; s32 physicalDmg; @@ -629,11 +629,11 @@ u8 GetBattlerAtPosition(u8 bank); struct BattleSpriteInfo { - u16 invisible : 1; // 0x1 - u16 lowHpSong : 1; // 0x2 - u16 behindSubstitute : 1; // 0x4 - u16 flag_x8 : 1; // 0x8 - u16 hpNumbersNoBars : 1; // 0x10 + u16 invisible:1; // 0x1 + u16 lowHpSong:1; // 0x2 + u16 behindSubstitute:1; // 0x4 + u16 flag_x8:1; // 0x8 + u16 hpNumbersNoBars:1; // 0x10 u16 transformSpecies; }; @@ -647,12 +647,12 @@ struct BattleAnimationInfo u8 field_6; u8 field_7; u8 ballThrowCaseId; - u8 field_9_x1 : 1; - u8 field_9_x2 : 1; - u8 field_9_x1C : 3; - u8 field_9_x20 : 1; - u8 field_9_x40 : 1; - u8 field_9_x80 : 1; + u8 field_9_x1:1; + u8 field_9_x2:1; + u8 field_9_x1C:3; + u8 field_9_x20:1; + u8 field_9_x40:1; + u8 field_9_x80:1; u8 field_A; u8 field_B; u8 field_C; @@ -663,21 +663,21 @@ struct BattleAnimationInfo struct BattleHealthboxInfo { - u8 flag_x1 : 1; - u8 flag_x2 : 1; - u8 flag_x4 : 1; - u8 ballAnimActive : 1; // 0x8 - u8 statusAnimActive : 1; // x10 - u8 animFromTableActive : 1; // x20 - u8 specialAnimActive : 1; //x40 - u8 flag_x80 : 1; - u8 field_1_x1 : 1; - u8 field_1_x1E : 4; - u8 field_1_x20 : 1; - u8 field_1_x40 : 1; - u8 field_1_x80 : 1; - u8 field_2; - u8 field_3; + u8 flag_x1:1; + u8 healthboxIsBouncing:1; + u8 battlerIsBouncing:1; + u8 ballAnimActive:1; // 0x8 + u8 statusAnimActive:1; // x10 + u8 animFromTableActive:1; // x20 + u8 specialAnimActive:1; //x40 + u8 flag_x80:1; + u8 field_1_x1:1; + u8 field_1_x1E:4; + u8 field_1_x20:1; + u8 field_1_x40:1; + u8 field_1_x80:1; + u8 healthboxBounceSpriteId; + u8 battlerBounceSpriteId; u8 animationState; u8 field_5; u8 field_6; diff --git a/include/battle_controllers.h b/include/battle_controllers.h index a0fc41b52..c5f5f48d7 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -82,8 +82,8 @@ enum struct UnusedControllerStruct { - u8 field_0 : 7; - u8 flag_x80 : 1; + u8 field_0:7; + u8 flag_x80:1; }; struct HpAndStatus @@ -161,7 +161,7 @@ enum CONTROLLER_INTROTRAINERBALLTHROW, CONTROLLER_DRAWPARTYSTATUSSUMMARY, CONTROLLER_49, - CONTROLLER_50, + CONTROLLER_ENDBOUNCE, CONTROLLER_SPRITEINVISIBILITY, CONTROLLER_BATTLEANIMATION, CONTROLLER_LINKSTANDBYMSG, @@ -231,7 +231,7 @@ void BtlController_EmitIntroSlide(u8 bufferId, u8 terrainId); void BtlController_EmitIntroTrainerBallThrow(u8 bufferId); void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2); void BtlController_EmitCmd49(u8 bufferId); -void BtlController_EmitCmd50(u8 bufferId); +void BtlController_EmitEndBounceEffect(u8 bufferId); void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible); void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument); void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2); diff --git a/include/battle_main.h b/include/battle_main.h index a725b631f..27e61c8fc 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -25,6 +25,10 @@ struct TrainerMoney #define TYPE_FORESIGHT 0xFE #define TYPE_ENDTABLE 0xFF +// defines for the 'DoBounceEffect' function +#define BOUNCE_MON 0x0 +#define BOUNCE_HEALTHBOX 0x1 + void CB2_InitBattle(void); void BattleMainCB2(void); void CB2_QuitRecordedBattle(void); @@ -38,15 +42,15 @@ u32 sub_80391E0(u8 arrayId, u8 caseId); u32 sub_80397C4(u32 setId, u32 tableId); void oac_poke_opponent(struct Sprite *sprite); void SpriteCallbackDummy_2(struct Sprite *sprite); -void sub_8039934(struct Sprite *sprite); +void SpriteCB_FaintOpponentMon(struct Sprite *sprite); void sub_8039AD8(struct Sprite *sprite); void sub_8039B2C(struct Sprite *sprite); void sub_8039B58(struct Sprite *sprite); void sub_8039BB4(struct Sprite *sprite); void sub_80105DC(struct Sprite *sprite); void sub_8039C00(struct Sprite *sprite); -void dp11b_obj_instanciate(u8 battlerId, u8 b, s8 c, s8 d); -void dp11b_obj_free(u8 battlerId, bool8 b); +void DoBounceEffect(u8 battlerId, u8 b, s8 c, s8 d); +void EndBounceEffect(u8 battlerId, bool8 b); void sub_8039E44(struct Sprite *sprite); void sub_8039E60(struct Sprite *sprite); void sub_8039E84(struct Sprite *sprite); @@ -80,6 +84,6 @@ extern const u8 gStatusConditionString_IceJpn[8]; extern const u8 gStatusConditionString_ConfusionJpn[8]; extern const u8 gStatusConditionString_LoveJpn[8]; -extern const u8 * const gStatusConditionStringsTable[7][2]; +extern const u8 *const gStatusConditionStringsTable[7][2]; #endif // GUARD_BATTLE_MAIN_H diff --git a/include/global.h b/include/global.h index d26184270..5a37cdc1b 100644 --- a/include/global.h +++ b/include/global.h @@ -35,12 +35,18 @@ // Converts a number to Q4.12 fixed-point format #define Q_4_12(n) ((s16)((n) * 4096)) +// Converts a number to Q24.8 fixed-point format +#define Q_24_8(n) ((s32)((n) * 256)) + // Converts a Q8.8 fixed-point format number to a regular integer #define Q_8_8_TO_INT(n) ((int)((n) / 256)) // Converts a Q4.12 fixed-point format number to a regular integer #define Q_4_12_TO_INT(n) ((int)((n) / 4096)) +// Converts a Q24.8 fixed-point format number to a regular integer +#define Q_24_8_TO_INT(n) ((int)((n) >> 8)) + #define PARTY_SIZE 6 #define POKEMON_SLOTS_NUMBER 412 diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index b2c05664b..0a53c2893 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -90,7 +90,7 @@ static void LinkOpponentHandleIntroSlide(void); static void LinkOpponentHandleIntroTrainerBallThrow(void); static void LinkOpponentHandleDrawPartyStatusSummary(void); static void LinkOpponentHandleCmd49(void); -static void LinkOpponentHandleCmd50(void); +static void LinkOpponentHandleEndBounceEffect(void); static void LinkOpponentHandleSpriteInvisibility(void); static void LinkOpponentHandleBattleAnimation(void); static void LinkOpponentHandleLinkStandbyMsg(void); @@ -162,7 +162,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkOpponentHandleIntroTrainerBallThrow, LinkOpponentHandleDrawPartyStatusSummary, LinkOpponentHandleCmd49, - LinkOpponentHandleCmd50, + LinkOpponentHandleEndBounceEffect, LinkOpponentHandleSpriteInvisibility, LinkOpponentHandleBattleAnimation, LinkOpponentHandleLinkStandbyMsg, @@ -1366,7 +1366,7 @@ static void LinkOpponentHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039934; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_8064C14; } } @@ -1803,7 +1803,7 @@ static void LinkOpponentHandleCmd49(void) LinkOpponentBufferExecCompleted(); } -static void LinkOpponentHandleCmd50(void) +static void LinkOpponentHandleEndBounceEffect(void) { LinkOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index f7abe589a..f5987c0ce 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -88,7 +88,7 @@ static void LinkPartnerHandleIntroSlide(void); static void LinkPartnerHandleIntroTrainerBallThrow(void); static void LinkPartnerHandleDrawPartyStatusSummary(void); static void LinkPartnerHandleCmd49(void); -static void LinkPartnerHandleCmd50(void); +static void LinkPartnerHandleEndBounceEffect(void); static void LinkPartnerHandleSpriteInvisibility(void); static void LinkPartnerHandleBattleAnimation(void); static void LinkPartnerHandleLinkStandbyMsg(void); @@ -159,7 +159,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkPartnerHandleIntroTrainerBallThrow, LinkPartnerHandleDrawPartyStatusSummary, LinkPartnerHandleCmd49, - LinkPartnerHandleCmd50, + LinkPartnerHandleEndBounceEffect, LinkPartnerHandleSpriteInvisibility, LinkPartnerHandleBattleAnimation, LinkPartnerHandleLinkStandbyMsg, @@ -1638,7 +1638,7 @@ static void LinkPartnerHandleCmd49(void) LinkPartnerBufferExecCompleted(); } -static void LinkPartnerHandleCmd50(void) +static void LinkPartnerHandleEndBounceEffect(void) { LinkPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 21b45dabf..83dac5436 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -95,7 +95,7 @@ static void OpponentHandleIntroSlide(void); static void OpponentHandleIntroTrainerBallThrow(void); static void OpponentHandleDrawPartyStatusSummary(void); static void OpponentHandleCmd49(void); -static void OpponentHandleCmd50(void); +static void OpponentHandleEndBounceEffect(void); static void OpponentHandleSpriteInvisibility(void); static void OpponentHandleBattleAnimation(void); static void OpponentHandleLinkStandbyMsg(void); @@ -167,7 +167,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = OpponentHandleIntroTrainerBallThrow, OpponentHandleDrawPartyStatusSummary, OpponentHandleCmd49, - OpponentHandleCmd50, + OpponentHandleEndBounceEffect, OpponentHandleSpriteInvisibility, OpponentHandleBattleAnimation, OpponentHandleLinkStandbyMsg, @@ -1403,7 +1403,7 @@ static void OpponentHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039934; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_805FAC4; } } @@ -1957,7 +1957,7 @@ static void OpponentHandleCmd49(void) OpponentBufferExecCompleted(); } -static void OpponentHandleCmd50(void) +static void OpponentHandleEndBounceEffect(void) { OpponentBufferExecCompleted(); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 599ebfee4..63dc989be 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -101,7 +101,7 @@ static void PlayerHandleIntroSlide(void); static void PlayerHandleIntroTrainerBallThrow(void); static void PlayerHandleDrawPartyStatusSummary(void); static void PlayerHandleCmd49(void); -static void PlayerHandleCmd50(void); +static void PlayerHandleEndBounceEffect(void); static void PlayerHandleSpriteInvisibility(void); static void PlayerHandleBattleAnimation(void); static void PlayerHandleLinkStandbyMsg(void); @@ -188,7 +188,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerHandleIntroTrainerBallThrow, PlayerHandleDrawPartyStatusSummary, PlayerHandleCmd49, - PlayerHandleCmd50, + PlayerHandleEndBounceEffect, PlayerHandleSpriteInvisibility, PlayerHandleBattleAnimation, PlayerHandleLinkStandbyMsg, @@ -250,8 +250,8 @@ static void HandleInputChooseAction(void) { u16 itemId = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8); - dp11b_obj_instanciate(gActiveBattler, 1, 7, 1); - dp11b_obj_instanciate(gActiveBattler, 0, 7, 1); + DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1); + DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1); if (gMain.newAndRepeatedKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2) gPlayerDpadHoldFrames++; @@ -347,8 +347,8 @@ static void HandleInputChooseAction(void) static void sub_80577F0(void) // unused { - dp11b_obj_free(gActiveBattler, 1); - dp11b_obj_free(gActiveBattler, 0); + EndBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX); + EndBounceEffect(gActiveBattler, BOUNCE_MON); gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseTarget; } @@ -358,7 +358,7 @@ static void HandleInputChooseTarget(void) u8 identities[4]; memcpy(identities, sTargetIdentities, ARRAY_COUNT(sTargetIdentities)); - dp11b_obj_instanciate(gMultiUsePlayerCursor, 1, 0xF, 1); + DoBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX, 15, 1); // what a weird loop i = 0; @@ -367,7 +367,7 @@ static void HandleInputChooseTarget(void) do { if (i != gMultiUsePlayerCursor) - dp11b_obj_free(i, 1); + EndBounceEffect(i, BOUNCE_HEALTHBOX); i++; } while (i < gBattlersCount); } @@ -382,7 +382,7 @@ static void HandleInputChooseTarget(void) PlaySE(SE_SELECT); gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C; BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8)); - dp11b_obj_free(gMultiUsePlayerCursor, 1); + EndBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX); PlayerBufferExecCompleted(); } else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59) @@ -390,9 +390,9 @@ static void HandleInputChooseTarget(void) PlaySE(SE_SELECT); gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C; gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove; - dp11b_obj_instanciate(gActiveBattler, 1, 7, 1); - dp11b_obj_instanciate(gActiveBattler, 0, 7, 1); - dp11b_obj_free(gMultiUsePlayerCursor, 1); + DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1); + DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1); + EndBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX); } else if (gMain.newKeys & (DPAD_LEFT | DPAD_UP)) { @@ -3030,10 +3030,10 @@ static void PlayerHandleCmd49(void) PlayerBufferExecCompleted(); } -static void PlayerHandleCmd50(void) +static void PlayerHandleEndBounceEffect(void) { - dp11b_obj_free(gActiveBattler, 1); - dp11b_obj_free(gActiveBattler, 0); + EndBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX); + EndBounceEffect(gActiveBattler, BOUNCE_MON); PlayerBufferExecCompleted(); } @@ -3072,8 +3072,8 @@ static void PlayerHandleLinkStandbyMsg(void) PrintLinkStandbyMsg(); // fall through case 1: - dp11b_obj_free(gActiveBattler, 1); - dp11b_obj_free(gActiveBattler, 0); + EndBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX); + EndBounceEffect(gActiveBattler, BOUNCE_MON); break; case 2: PrintLinkStandbyMsg(); diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index df075522e..17ed1c24f 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -88,7 +88,7 @@ static void PlayerPartnerHandleIntroSlide(void); static void PlayerPartnerHandleIntroTrainerBallThrow(void); static void PlayerPartnerHandleDrawPartyStatusSummary(void); static void PlayerPartnerHandleCmd49(void); -static void PlayerPartnerHandleCmd50(void); +static void PlayerPartnerHandleEndBounceEffect(void); static void PlayerPartnerHandleSpriteInvisibility(void); static void PlayerPartnerHandleBattleAnimation(void); static void PlayerPartnerHandleLinkStandbyMsg(void); @@ -165,7 +165,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerPartnerHandleIntroTrainerBallThrow, PlayerPartnerHandleDrawPartyStatusSummary, PlayerPartnerHandleCmd49, - PlayerPartnerHandleCmd50, + PlayerPartnerHandleEndBounceEffect, PlayerPartnerHandleSpriteInvisibility, PlayerPartnerHandleBattleAnimation, PlayerPartnerHandleLinkStandbyMsg, @@ -1884,7 +1884,7 @@ static void PlayerPartnerHandleCmd49(void) PlayerPartnerBufferExecCompleted(); } -static void PlayerPartnerHandleCmd50(void) +static void PlayerPartnerHandleEndBounceEffect(void) { PlayerPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 69f93d7e2..9d213fc6b 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -91,7 +91,7 @@ static void RecordedOpponentHandleIntroSlide(void); static void RecordedOpponentHandleIntroTrainerBallThrow(void); static void RecordedOpponentHandleDrawPartyStatusSummary(void); static void RecordedOpponentHandleCmd49(void); -static void RecordedOpponentHandleCmd50(void); +static void RecordedOpponentHandleEndBounceEffect(void); static void RecordedOpponentHandleSpriteInvisibility(void); static void RecordedOpponentHandleBattleAnimation(void); static void RecordedOpponentHandleLinkStandbyMsg(void); @@ -163,7 +163,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void RecordedOpponentHandleIntroTrainerBallThrow, RecordedOpponentHandleDrawPartyStatusSummary, RecordedOpponentHandleCmd49, - RecordedOpponentHandleCmd50, + RecordedOpponentHandleEndBounceEffect, RecordedOpponentHandleSpriteInvisibility, RecordedOpponentHandleBattleAnimation, RecordedOpponentHandleLinkStandbyMsg, @@ -1296,7 +1296,7 @@ static void RecordedOpponentHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); - gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039934; + gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_8186D58; } } @@ -1745,7 +1745,7 @@ static void RecordedOpponentHandleCmd49(void) RecordedOpponentBufferExecCompleted(); } -static void RecordedOpponentHandleCmd50(void) +static void RecordedOpponentHandleEndBounceEffect(void) { RecordedOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 54ca4578b..d1836c092 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -90,7 +90,7 @@ static void RecordedPlayerHandleIntroSlide(void); static void RecordedPlayerHandleIntroTrainerBallThrow(void); static void RecordedPlayerHandleDrawPartyStatusSummary(void); static void RecordedPlayerHandleCmd49(void); -static void RecordedPlayerHandleCmd50(void); +static void RecordedPlayerHandleEndBounceEffect(void); static void RecordedPlayerHandleSpriteInvisibility(void); static void RecordedPlayerHandleBattleAnimation(void); static void RecordedPlayerHandleLinkStandbyMsg(void); @@ -161,7 +161,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) RecordedPlayerHandleIntroTrainerBallThrow, RecordedPlayerHandleDrawPartyStatusSummary, RecordedPlayerHandleCmd49, - RecordedPlayerHandleCmd50, + RecordedPlayerHandleEndBounceEffect, RecordedPlayerHandleSpriteInvisibility, RecordedPlayerHandleBattleAnimation, RecordedPlayerHandleLinkStandbyMsg, @@ -1767,7 +1767,7 @@ static void RecordedPlayerHandleCmd49(void) RecordedPlayerBufferExecCompleted(); } -static void RecordedPlayerHandleCmd50(void) +static void RecordedPlayerHandleEndBounceEffect(void) { RecordedPlayerBufferExecCompleted(); } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 245447d8d..3cdd952ef 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -81,7 +81,7 @@ static void SafariHandleIntroSlide(void); static void SafariHandleIntroTrainerBallThrow(void); static void SafariHandleDrawPartyStatusSummary(void); static void SafariHandleCmd49(void); -static void SafariHandleCmd50(void); +static void SafariHandleEndBounceEffect(void); static void SafariHandleSpriteInvisibility(void); static void SafariHandleBattleAnimation(void); static void SafariHandleLinkStandbyMsg(void); @@ -145,7 +145,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) = SafariHandleIntroTrainerBallThrow, SafariHandleDrawPartyStatusSummary, SafariHandleCmd49, - SafariHandleCmd50, + SafariHandleEndBounceEffect, SafariHandleSpriteInvisibility, SafariHandleBattleAnimation, SafariHandleLinkStandbyMsg, @@ -650,7 +650,7 @@ static void SafariHandleCmd49(void) SafariBufferExecCompleted(); } -static void SafariHandleCmd50(void) +static void SafariHandleEndBounceEffect(void) { SafariBufferExecCompleted(); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 955799ee3..05c7b9e1f 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -91,7 +91,7 @@ static void WallyHandleIntroSlide(void); static void WallyHandleIntroTrainerBallThrow(void); static void WallyHandleDrawPartyStatusSummary(void); static void WallyHandleCmd49(void); -static void WallyHandleCmd50(void); +static void WallyHandleEndBounceEffect(void); static void WallyHandleSpriteInvisibility(void); static void WallyHandleBattleAnimation(void); static void WallyHandleLinkStandbyMsg(void); @@ -160,7 +160,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = WallyHandleIntroTrainerBallThrow, WallyHandleDrawPartyStatusSummary, WallyHandleCmd49, - WallyHandleCmd50, + WallyHandleEndBounceEffect, WallyHandleSpriteInvisibility, WallyHandleBattleAnimation, WallyHandleLinkStandbyMsg, @@ -1522,7 +1522,7 @@ static void WallyHandleCmd49(void) WallyBufferExecCompleted(); } -static void WallyHandleCmd50(void) +static void WallyHandleEndBounceEffect(void) { WallyBufferExecCompleted(); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 8a7ff7b5d..1c60e22ef 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1463,12 +1463,12 @@ void BtlController_EmitCmd49(u8 bufferId) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitCmd50(u8 bufferId) +void BtlController_EmitEndBounceEffect(u8 bufferId) { - sBattleBuffersTransferData[0] = CONTROLLER_50; - sBattleBuffersTransferData[1] = CONTROLLER_50; - sBattleBuffersTransferData[2] = CONTROLLER_50; - sBattleBuffersTransferData[3] = CONTROLLER_50; + sBattleBuffersTransferData[0] = CONTROLLER_ENDBOUNCE; + sBattleBuffersTransferData[1] = CONTROLLER_ENDBOUNCE; + sBattleBuffersTransferData[2] = CONTROLLER_ENDBOUNCE; + sBattleBuffersTransferData[3] = CONTROLLER_ENDBOUNCE; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } diff --git a/src/battle_interface.c b/src/battle_interface.c index 94b5a2be9..f5e031cb9 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1483,12 +1483,18 @@ void SwapHpBarsWithHpText(void) } } +#define tBattler data[0] +#define tSummaryBarSpriteId data[1] +#define tBallIconSpriteId(n) data[3 + n] +#define tIsBattleStart data[10] +#define tData15 data[15] + u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart) { bool8 isOpponent; s16 bar_X, bar_Y, bar_pos2_X, bar_data0; s32 i, j, var; - u8 barSpriteId; + u8 summaryBarSpriteId; u8 ballIconSpritesIds[PARTY_SIZE]; u8 taskId; @@ -1527,19 +1533,19 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, LoadSpritePalette(&sStatusSummaryBarSpritePal); LoadSpritePalette(&sStatusSummaryBallsSpritePal); - barSpriteId = CreateSprite(&sStatusSummaryBarSpriteTemplates[isOpponent], bar_X, bar_Y, 10); - SetSubspriteTables(&gSprites[barSpriteId], sStatusSummaryBar_SubspriteTable); - gSprites[barSpriteId].pos2.x = bar_pos2_X; - gSprites[barSpriteId].data[0] = bar_data0; + summaryBarSpriteId = CreateSprite(&sStatusSummaryBarSpriteTemplates[isOpponent], bar_X, bar_Y, 10); + SetSubspriteTables(&gSprites[summaryBarSpriteId], sStatusSummaryBar_SubspriteTable); + gSprites[summaryBarSpriteId].pos2.x = bar_pos2_X; + gSprites[summaryBarSpriteId].data[0] = bar_data0; if (isOpponent) { - gSprites[barSpriteId].pos1.x -= 96; - gSprites[barSpriteId].oam.matrixNum = 8; + gSprites[summaryBarSpriteId].pos1.x -= 96; + gSprites[summaryBarSpriteId].oam.matrixNum = 8; } else { - gSprites[barSpriteId].pos1.x += 96; + gSprites[summaryBarSpriteId].pos1.x += 96; } for (i = 0; i < PARTY_SIZE; i++) @@ -1555,7 +1561,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, gSprites[ballIconSpritesIds[i]].pos2.y = 0; } - gSprites[ballIconSpritesIds[i]].data[0] = barSpriteId; + gSprites[ballIconSpritesIds[i]].data[0] = summaryBarSpriteId; if (!isOpponent) { @@ -1672,13 +1678,13 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, } taskId = CreateTask(TaskDummy, 5); - gTasks[taskId].data[0] = battlerId; - gTasks[taskId].data[1] = barSpriteId; + gTasks[taskId].tBattler = battlerId; + gTasks[taskId].tSummaryBarSpriteId = summaryBarSpriteId; for (i = 0; i < PARTY_SIZE; i++) - gTasks[taskId].data[3 + i] = ballIconSpritesIds[i]; + gTasks[taskId].tBallIconSpriteId(i) = ballIconSpritesIds[i]; - gTasks[taskId].data[10] = isBattleStart; + gTasks[taskId].tIsBattleStart = isBattleStart; if (isBattleStart) { @@ -1691,46 +1697,46 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, void sub_8073C30(u8 taskId) { - u8 sp[6]; - u8 r7; + u8 ballIconSpriteIds[PARTY_SIZE]; + bool8 isBattleStart; u8 summaryBarSpriteId; u8 battlerId; s32 i; - r7 = gTasks[taskId].data[10]; - summaryBarSpriteId = gTasks[taskId].data[1]; - battlerId = gTasks[taskId].data[0]; + isBattleStart = gTasks[taskId].tIsBattleStart; + summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; + battlerId = gTasks[taskId].tBattler; for (i = 0; i < 6; i++) - sp[i] = gTasks[taskId].data[3 + i]; + ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); SetGpuReg(REG_OFFSET_BLDALPHA, 0x10); - gTasks[taskId].data[15] = 16; + gTasks[taskId].tData15 = 16; - for (i = 0; i < 6; i++) - gSprites[sp[i]].oam.objMode = 1; + for (i = 0; i < PARTY_SIZE; i++) + gSprites[ballIconSpriteIds[i]].oam.objMode = 1; gSprites[summaryBarSpriteId].oam.objMode = 1; - if (r7 != 0) + if (isBattleStart) { - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) { - gSprites[sp[5 - i]].data[1] = 7 * i; - gSprites[sp[5 - i]].data[3] = 0; - gSprites[sp[5 - i]].data[4] = 0; - gSprites[sp[5 - i]].callback = sub_8074158; + gSprites[ballIconSpriteIds[5 - i]].data[1] = 7 * i; + gSprites[ballIconSpriteIds[5 - i]].data[3] = 0; + gSprites[ballIconSpriteIds[5 - i]].data[4] = 0; + gSprites[ballIconSpriteIds[5 - i]].callback = sub_8074158; } else { - gSprites[sp[i]].data[1] = 7 * i; - gSprites[sp[i]].data[3] = 0; - gSprites[sp[i]].data[4] = 0; - gSprites[sp[i]].callback = sub_8074158; + gSprites[ballIconSpriteIds[i]].data[1] = 7 * i; + gSprites[ballIconSpriteIds[i]].data[3] = 0; + gSprites[ballIconSpriteIds[i]].data[4] = 0; + gSprites[ballIconSpriteIds[i]].callback = sub_8074158; } } gSprites[summaryBarSpriteId].data[0] /= 2; @@ -1747,12 +1753,9 @@ void sub_8073C30(u8 taskId) static void sub_8073E08(u8 taskId) { - u16 temp = gTasks[taskId].data[11]++; - - if (!(temp & 1)) + if ((gTasks[taskId].data[11]++ % 2) == 0) { - gTasks[taskId].data[15]--; - if (gTasks[taskId].data[15] < 0) + if (--gTasks[taskId].data[15] < 0) return; SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[15]) | ((16 - gTasks[taskId].data[15]) << 8)); @@ -1763,36 +1766,35 @@ static void sub_8073E08(u8 taskId) static void sub_8073E64(u8 taskId) { - u8 sp[6]; + u8 ballIconSpriteIds[PARTY_SIZE]; s32 i; - u8 battlerId = gTasks[taskId].data[0]; - gTasks[taskId].data[15]--; - if (gTasks[taskId].data[15] == -1) + u8 battlerId = gTasks[taskId].tBattler; + if (--gTasks[taskId].tData15 == -1) { - u8 summaryBarSpriteId = gTasks[taskId].data[1]; + u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; - for (i = 0; i < 6; i++) - sp[i] = gTasks[taskId].data[3 + i]; + for (i = 0; i < PARTY_SIZE; i++) + ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); gBattleSpritesDataPtr->animationData->field_9_x1C--; - if (!gBattleSpritesDataPtr->animationData->field_9_x1C) + if (gBattleSpritesDataPtr->animationData->field_9_x1C == 0) { DestroySpriteAndFreeResources(&gSprites[summaryBarSpriteId]); - DestroySpriteAndFreeResources(&gSprites[sp[0]]); + DestroySpriteAndFreeResources(&gSprites[ballIconSpriteIds[0]]); } else { FreeSpriteOamMatrix(&gSprites[summaryBarSpriteId]); DestroySprite(&gSprites[summaryBarSpriteId]); - FreeSpriteOamMatrix(&gSprites[sp[0]]); - DestroySprite(&gSprites[sp[0]]); + FreeSpriteOamMatrix(&gSprites[ballIconSpriteIds[0]]); + DestroySprite(&gSprites[ballIconSpriteIds[0]]); } - for (i = 1; i < 6; i++) - DestroySprite(&gSprites[sp[i]]); + for (i = 1; i < PARTY_SIZE; i++) + DestroySprite(&gSprites[ballIconSpriteIds[i]]); } - else if (gTasks[taskId].data[15] == -3) + else if (gTasks[taskId].tData15 == -3) { gBattleSpritesDataPtr->healthBoxesData[battlerId].flag_x1 = 0; SetGpuReg(REG_OFFSET_BLDCNT, 0); @@ -1803,29 +1805,28 @@ static void sub_8073E64(u8 taskId) static void sub_8073F98(u8 taskId) { - u8 sp[6]; + u8 ballIconSpriteIds[PARTY_SIZE]; s32 i; + u8 battlerId = gTasks[taskId].tBattler; - u8 battlerId = gTasks[taskId].data[0]; - gTasks[taskId].data[15]--; - if (gTasks[taskId].data[15] >= 0) + if (--gTasks[taskId].tData15 >= 0) { - SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[15]) | ((16 - gTasks[taskId].data[15]) << 8)); + SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tData15) | ((16 - gTasks[taskId].tData15) << 8)); } - else if (gTasks[taskId].data[15] == -1) + else if (gTasks[taskId].tData15 == -1) { - u8 summaryBarSpriteId = gTasks[taskId].data[1]; + u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; - for (i = 0; i < 6; i++) - sp[i] = gTasks[taskId].data[3 + i]; + for (i = 0; i < PARTY_SIZE; i++) + ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); DestroySpriteAndFreeResources(&gSprites[summaryBarSpriteId]); - DestroySpriteAndFreeResources(&gSprites[sp[0]]); + DestroySpriteAndFreeResources(&gSprites[ballIconSpriteIds[0]]); - for (i = 1; i < 6; i++) - DestroySprite(&gSprites[sp[i]]); + for (i = 1; i < PARTY_SIZE; i++) + DestroySprite(&gSprites[ballIconSpriteIds[i]]); } - else if (gTasks[taskId].data[15] == -3) + else if (gTasks[taskId].tData15 == -3) { gBattleSpritesDataPtr->healthBoxesData[battlerId].flag_x1 = 0; SetGpuReg(REG_OFFSET_BLDCNT, 0); @@ -1834,6 +1835,12 @@ static void sub_8073F98(u8 taskId) } } +#undef tBattler +#undef tSummaryBarSpriteId +#undef tBallIconSpriteId +#undef tIsBattleStart +#undef tData15 + static void SpriteCB_StatusSummaryBar(struct Sprite *sprite) { if (sprite->pos2.x != 0) @@ -2253,8 +2260,8 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem } } -#define EXPBAR_PIXELS 64 -#define HEALTHBAR_PIXELS 48 +#define B_EXPBAR_PIXELS 64 +#define B_HEALTHBAR_PIXELS 48 s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) { @@ -2266,7 +2273,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue, - HEALTHBAR_PIXELS / 8, 1); + B_HEALTHBAR_PIXELS / 8, 1); } else // exp bar { @@ -2281,7 +2288,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue, - EXPBAR_PIXELS / 8, expFraction); + B_EXPBAR_PIXELS / 8, expFraction); } if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)) @@ -2307,11 +2314,11 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar) gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue, - array, HEALTHBAR_PIXELS / 8); + array, B_HEALTHBAR_PIXELS / 8); - if (filledPixelsCount > (HEALTHBAR_PIXELS * 50 / 100)) // more than 50 % hp + if (filledPixelsCount > (B_HEALTHBAR_PIXELS * 50 / 100)) // more than 50 % hp barElementId = HEALTHBOX_GFX_HP_BAR_GREEN; - else if (filledPixelsCount > (HEALTHBAR_PIXELS * 20 / 100)) // more than 20% hp + else if (filledPixelsCount > (B_HEALTHBAR_PIXELS * 20 / 100)) // more than 20% hp barElementId = HEALTHBOX_GFX_HP_BAR_YELLOW; else barElementId = HEALTHBOX_GFX_HP_BAR_RED; // 20 % or less @@ -2332,7 +2339,7 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar) gBattleSpritesDataPtr->battleBars[battlerId].oldValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue, - array, EXPBAR_PIXELS / 8); + array, B_EXPBAR_PIXELS / 8); level = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_LEVEL); if (level == MAX_MON_LEVEL) { @@ -2360,7 +2367,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (*currValue == -32768) // first function call { if (maxValue < scale) - *currValue = oldValue << 8; + *currValue = Q_24_8(oldValue); else *currValue = oldValue; } @@ -2373,9 +2380,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (maxValue < scale) { - s32 var = *currValue >> 8; - - if (newValue == var && (*currValue & 0xFF) == 0) + if (newValue == Q_24_8_TO_INT(*currValue) && (*currValue & 0xFF) == 0) return -1; } else @@ -2386,27 +2391,28 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (maxValue < scale) // handle cases of max var having less pixels than the whole bar { - s32 var = (maxValue << 8) / scale; + s32 toAdd = Q_24_8(maxValue) / scale; if (receivedValue < 0) // fill bar right { - *currValue += var; - ret = *currValue >> 8; + *currValue += toAdd; + ret = Q_24_8_TO_INT(*currValue); if (ret >= newValue) { - *currValue = newValue << 8; + *currValue = Q_24_8(newValue); ret = newValue; } } else // move bar left { - *currValue -= var; - ret = *currValue >> 8; + *currValue -= toAdd; + ret = Q_24_8_TO_INT(*currValue); + // try round up if ((*currValue & 0xFF) > 0) ret++; if (ret <= newValue) { - *currValue = newValue << 8; + *currValue = Q_24_8(newValue); ret = newValue; } } @@ -2480,34 +2486,35 @@ static u8 CalcBarFilledPixels(s32 maxValue, s32 oldValue, s32 receivedValue, s32 return filledPixels; } -static s16 sub_8074F28(struct TestingBar *barInfo, s32 *arg1, u16 *arg2, s32 arg3) +// These two functions seem as if they were made for testing the health bar. +static s16 sub_8074F28(struct TestingBar *barInfo, s32 *currValue, u16 *arg2, s32 arg3) { s16 ret, var; ret = CalcNewBarValue(barInfo->maxValue, barInfo->oldValue, barInfo->receivedValue, - arg1, 6, 1); - sub_8074F88(barInfo, arg1, arg2); + currValue, B_HEALTHBAR_PIXELS / 8, 1); + sub_8074F88(barInfo, currValue, arg2); - if (barInfo->maxValue < HEALTHBAR_PIXELS) - var = *arg1 >> 8; + if (barInfo->maxValue < B_HEALTHBAR_PIXELS) + var = *currValue >> 8; else - var = *arg1; + var = *currValue; DummiedOutFunction(barInfo->maxValue, var, arg3); return ret; } -static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2) +static void sub_8074F88(struct TestingBar *barInfo, s32 *currValue, u16 *arg2) { u8 sp8[6]; u16 sp10[6]; u8 i; CalcBarFilledPixels(barInfo->maxValue, barInfo->oldValue, - barInfo->receivedValue, arg1, sp8, 6); + barInfo->receivedValue, currValue, sp8, B_HEALTHBAR_PIXELS / 8); for (i = 0; i < 6; i++) sp10[i] = (barInfo->unkC_0 << 12) | (barInfo->unk10 + sp8[i]); @@ -2547,7 +2554,7 @@ u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale) u8 GetHPBarLevel(s16 hp, s16 maxhp) { - s32 result; + u8 result; if (hp == maxhp) { @@ -2555,10 +2562,10 @@ u8 GetHPBarLevel(s16 hp, s16 maxhp) } else { - u8 fraction = GetScaledHPFraction(hp, maxhp, 48); - if (fraction > 24) + u8 fraction = GetScaledHPFraction(hp, maxhp, B_HEALTHBAR_PIXELS); + if (fraction > (B_HEALTHBAR_PIXELS * 50 / 100)) // more than 50 % hp result = HP_BAR_GREEN; - else if (fraction > 9) + else if (fraction > (B_HEALTHBAR_PIXELS * 20 / 100)) // more than 20% hp result = HP_BAR_YELLOW; else if (fraction > 0) result = HP_BAR_RED; diff --git a/src/battle_main.c b/src/battle_main.c index 2d24d0dab..9afbc7f40 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -41,6 +41,7 @@ #include "pokedex.h" #include "constants/abilities.h" #include "constants/moves.h" +#include "constants/rgb.h" #include "evolution_scene.h" #include "roamer.h" #include "tv.h" @@ -137,13 +138,13 @@ static void sub_803980C(struct Sprite *sprite); static void sub_8039838(struct Sprite *sprite); static void sub_8039894(struct Sprite *sprite); static void sub_80398D0(struct Sprite *sprite); -static void sub_8039A48(struct Sprite *sprite); +static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite); static void sub_8039AF4(struct Sprite *sprite); static void SpriteCallbackDummy_3(struct Sprite *sprite); static void oac_poke_ally_(struct Sprite *sprite); static void SpecialStatusesClear(void); static void TurnValuesCleanUp(bool8 var0); -static void SpriteCB_HealthBoxBounce(struct Sprite *sprite); +static void SpriteCB_BounceEffect(struct Sprite *sprite); static void BattleStartClearSetData(void); static void BattleIntroGetMonsData(void); static void BattleIntroPrepareBackgroundSlide(void); @@ -183,7 +184,7 @@ static void HandleAction_SafariZoneBallThrow(void); static void HandleAction_ThrowPokeblock(void); static void HandleAction_GoNear(void); static void HandleAction_SafriZoneRun(void); -static void HandleAction_Action9(void); +static void HandleAction_WallyBallThrow(void); static void HandleAction_Action11(void); static void HandleAction_NothingIsFainted(void); static void HandleAction_ActionFinished(void); @@ -515,7 +516,7 @@ static void (* const sTurnActionsFuncsTable[])(void) = HandleAction_ThrowPokeblock, // B_ACTION_SAFARI_POKEBLOCK HandleAction_GoNear, // B_ACTION_SAFARI_GO_NEAR HandleAction_SafriZoneRun, // B_ACTION_SAFARI_RUN - HandleAction_Action9, // B_ACTION_UNKNOWN9 + HandleAction_WallyBallThrow, // B_ACTION_WALLY_THROW HandleAction_RunBattleScript, // B_ACTION_EXEC_SCRIPT HandleAction_Action11, // not sure about this one HandleAction_ActionFinished, // B_ACTION_FINISHED @@ -532,7 +533,7 @@ static void (* const sEndTurnFuncsTable[])(void) = HandleEndTurn_FinishBattle, // B_OUTCOME_PLAYER_TELEPORTED HandleEndTurn_MonFled, // B_OUTCOME_MON_FLED HandleEndTurn_FinishBattle, // B_OUTCOME_CAUGHT - HandleEndTurn_FinishBattle, // battle outcome 8 + HandleEndTurn_FinishBattle, // B_OUTCOME_NO_SAFARI_BALLS HandleEndTurn_FinishBattle, // B_OUTCOME_FORFEITED HandleEndTurn_FinishBattle, // B_OUTCOME_MON_TELEPORTED }; @@ -678,7 +679,7 @@ static void CB2_InitBattleInternal(void) gMain.inBattle = TRUE; gSaveBlock2Ptr->field_CA9_b = 0; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) AdjustFriendship(&gPlayerParty[i], 3); gBattleCommunication[MULTIUSE_STATE] = 0; @@ -739,7 +740,7 @@ static void SetPlayerBerryDataInBattleStruct(void) } else { - const struct Berry* berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY)); + const struct Berry *berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY)); for (i = 0; i < BERRY_NAME_COUNT - 1; i++) battleBerry->name[i] = berryData->name[i]; @@ -783,7 +784,7 @@ static void SetAllPlayersBerryData(void) } else { - const struct Berry* berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY)); + const struct Berry *berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY)); for (i = 0; i < BERRY_NAME_COUNT - 1; i++) { @@ -809,7 +810,7 @@ static void SetAllPlayersBerryData(void) { s32 numPlayers; struct BattleEnigmaBerry *src; - u8 r4; + u8 battlerId; if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -821,17 +822,17 @@ static void SetAllPlayersBerryData(void) for (i = 0; i < numPlayers; i++) { src = (struct BattleEnigmaBerry *)(gBlockRecvBuffer[i] + 2); - r4 = gLinkPlayers[i].lp_field_18; + battlerId = gLinkPlayers[i].lp_field_18; for (j = 0; j < BERRY_NAME_COUNT - 1; j++) - gEnigmaBerries[r4].name[j] = src->name[j]; - gEnigmaBerries[r4].name[j] = EOS; + gEnigmaBerries[battlerId].name[j] = src->name[j]; + gEnigmaBerries[battlerId].name[j] = EOS; for (j = 0; j < BERRY_ITEM_EFFECT_COUNT; j++) - gEnigmaBerries[r4].itemEffect[j] = src->itemEffect[j]; + gEnigmaBerries[battlerId].itemEffect[j] = src->itemEffect[j]; - gEnigmaBerries[r4].holdEffect = src->holdEffect; - gEnigmaBerries[r4].holdEffectParam = src->holdEffectParam; + gEnigmaBerries[battlerId].holdEffect = src->holdEffect; + gEnigmaBerries[battlerId].holdEffectParam = src->holdEffectParam; } } else @@ -1382,7 +1383,7 @@ static void CB2_PreInitMultiBattle(void) u8 playerMultiplierId; s32 numPlayers = 4; u8 r4 = 0xF; - u32* savedBattleTypeFlags; + u32 *savedBattleTypeFlags; void (**savedCallback)(void); if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) @@ -1476,7 +1477,7 @@ static void CB2_PreInitMultiBattle(void) static void CB2_PreInitIngamePlayerPartnerBattle(void) { - u32* savedBattleTypeFlags; + u32 *savedBattleTypeFlags; void (**savedCallback)(void); savedCallback = &gBattleStruct->savedCallback; @@ -1819,7 +1820,7 @@ void BattleMainCB2(void) { gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; ResetPaletteFadeControl(); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); SetMainCallback2(CB2_QuitRecordedBattle); } } @@ -2026,7 +2027,7 @@ void sub_8038A04(void) // unused void VBlankCB_Battle(void) { - // change gRngSeed every vblank unless the battle could be recorded + // Change gRngSeed every vblank unless the battle could be recorded. if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED))) Random(); @@ -2192,7 +2193,7 @@ void sub_8038D64(void) } for (i = 80; i < 160; i++) { - asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter + asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter. gScanlineEffectRegBuffers[0][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10; } @@ -2255,7 +2256,7 @@ static void sub_8038F34(void) case 1: if (--gBattleCommunication[1] == 0) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); gBattleCommunication[MULTIUSE_STATE]++; } break; @@ -2312,7 +2313,7 @@ static void sub_8038F34(void) for (i = 0; i < 2; i++) LoadChosenBattleElement(i); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(-1, 0, 0x10, 0, RGB_BLACK); gBattleCommunication[MULTIUSE_STATE]++; break; case 4: @@ -2417,7 +2418,7 @@ static void sub_80392A8(void) gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); SetMainCallback2(sub_803937C); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(-1, 0, 0x10, 0, RGB_BLACK); gBattleCommunication[MULTIUSE_STATE] = 0; } @@ -2577,7 +2578,7 @@ static void sub_803939C(void) { if (sub_800A520() == TRUE) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); gBattleCommunication[1] = 0x20; gBattleCommunication[MULTIUSE_STATE] = 8; } @@ -2585,7 +2586,7 @@ static void sub_803939C(void) } else { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK); gBattleCommunication[1] = 0x20; gBattleCommunication[MULTIUSE_STATE] = 8; } @@ -2620,7 +2621,7 @@ void oac_poke_opponent(struct Sprite *sprite) { sprite->callback = sub_803980C; StartSpriteAnimIfDifferent(sprite, 0); - BeginNormalPaletteFade(0x20000, 0, 10, 10, 0x2108); + BeginNormalPaletteFade(0x20000, 0, 10, 10, RGB(8, 8, 8)); } static void sub_803980C(struct Sprite *sprite) @@ -2643,7 +2644,7 @@ static void sub_8039838(struct Sprite *sprite) SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->sBattler]); sprite->callback = sub_8039894; StartSpriteAnimIfDifferent(sprite, 0); - BeginNormalPaletteFade(0x20000, 0, 10, 0, 0x2108); + BeginNormalPaletteFade(0x20000, 0, 10, 0, RGB(8, 8, 8)); } } @@ -2687,7 +2688,7 @@ static void sub_80398D0(struct Sprite *sprite) extern const struct MonCoords gMonFrontPicCoords[]; extern const struct MonCoords gCastformFrontSpriteCoords[]; -void sub_8039934(struct Sprite *sprite) +void SpriteCB_FaintOpponentMon(struct Sprite *sprite) { u8 battler = sprite->sBattler; u16 species; @@ -2698,7 +2699,7 @@ void sub_8039934(struct Sprite *sprite) else species = sprite->sSpeciesId; - GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_PERSONALITY); // Unused return value + GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_PERSONALITY); // Unused return value. if (species == SPECIES_UNOWN) { @@ -2707,9 +2708,9 @@ void sub_8039934(struct Sprite *sprite) u16 unownSpecies; if (unownForm == 0) - unownSpecies = SPECIES_UNOWN; // Use the A Unown form + unownSpecies = SPECIES_UNOWN; // Use the A Unown form. else - unownSpecies = NUM_SPECIES + unownForm; // Use one of the other Unown letters + unownSpecies = NUM_SPECIES + unownForm; // Use one of the other Unown letters. yOffset = gMonFrontPicCoords[unownSpecies].y_offset; } @@ -2728,25 +2729,23 @@ void sub_8039934(struct Sprite *sprite) sprite->data[3] = 8 - yOffset / 8; sprite->data[4] = 1; - sprite->callback = sub_8039A48; + sprite->callback = SpriteCB_AnimFaintOpponent; } -static void sub_8039A48(struct Sprite *sprite) +static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite) { s32 i; - sprite->data[4]--; - if (sprite->data[4] == 0) + if (--sprite->data[4] == 0) { sprite->data[4] = 2; - sprite->pos2.y += 8; - sprite->data[3]--; - if (sprite->data[3] < 0) + sprite->pos2.y += 8; // Move the sprite down. + if (--sprite->data[3] < 0) { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); } - else + else // Erase bottom part of the sprite to create a smooth illusion of mon falling down. { u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBattlerPosition(sprite->sBattler)] + (gBattleMonForms[sprite->sBattler] << 11) + (sprite->data[3] << 8); @@ -2831,85 +2830,100 @@ void sub_8039C00(struct Sprite *sprite) } } -void dp11b_obj_instanciate(u8 battler, u8 b, s8 c, s8 d) +#define sSinIndex data[0] +#define sDelta data[1] +#define sAmplitude data[2] +#define sBouncerSpriteId data[3] +#define sWhich data[4] + +void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude) { - u8 bounceHealthBoxSpriteId; - u8 spriteId2; + u8 invisibleSpriteId; + u8 bouncerSpriteId; - if (b) + switch (which) { - if (gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2) + case BOUNCE_HEALTHBOX: + default: + if (gBattleSpritesDataPtr->healthBoxesData[battler].healthboxIsBouncing) return; - } - else - { - if (gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4) + break; + case BOUNCE_MON: + if (gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing) return; + break; } - bounceHealthBoxSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_HealthBoxBounce); - if (b == TRUE) + invisibleSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_BounceEffect); + if (which == BOUNCE_HEALTHBOX) { - spriteId2 = gHealthboxSpriteIds[battler]; - gBattleSpritesDataPtr->healthBoxesData[battler].field_2 = bounceHealthBoxSpriteId; - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2 = 1; - gSprites[bounceHealthBoxSpriteId].data[0] = 0x80; + bouncerSpriteId = gHealthboxSpriteIds[battler]; + gBattleSpritesDataPtr->healthBoxesData[battler].healthboxBounceSpriteId = invisibleSpriteId; + gBattleSpritesDataPtr->healthBoxesData[battler].healthboxIsBouncing = 1; + gSprites[invisibleSpriteId].sSinIndex = 128; // 0 } else { - spriteId2 = gBattlerSpriteIds[battler]; - gBattleSpritesDataPtr->healthBoxesData[battler].field_3 = bounceHealthBoxSpriteId; - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4 = 1; - gSprites[bounceHealthBoxSpriteId].data[0] = 0xC0; - } - gSprites[bounceHealthBoxSpriteId].data[1] = c; - gSprites[bounceHealthBoxSpriteId].data[2] = d; - gSprites[bounceHealthBoxSpriteId].data[3] = spriteId2; - gSprites[bounceHealthBoxSpriteId].data[4] = b; - gSprites[spriteId2].pos2.x = 0; - gSprites[spriteId2].pos2.y = 0; + bouncerSpriteId = gBattlerSpriteIds[battler]; + gBattleSpritesDataPtr->healthBoxesData[battler].battlerBounceSpriteId = invisibleSpriteId; + gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing = 1; + gSprites[invisibleSpriteId].sSinIndex = 192; // -1 + } + gSprites[invisibleSpriteId].sDelta = delta; + gSprites[invisibleSpriteId].sAmplitude = amplitude; + gSprites[invisibleSpriteId].sBouncerSpriteId = bouncerSpriteId; + gSprites[invisibleSpriteId].sWhich = which; + gSprites[bouncerSpriteId].pos2.x = 0; + gSprites[bouncerSpriteId].pos2.y = 0; } -void dp11b_obj_free(u8 battler, bool8 b) +void EndBounceEffect(u8 battler, u8 which) { - u8 r4; + u8 bouncerSpriteId; - if (b == TRUE) + if (which == BOUNCE_HEALTHBOX) { - if (!gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2) + if (!gBattleSpritesDataPtr->healthBoxesData[battler].healthboxIsBouncing) return; - r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_2].data[3]; - DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_2]); - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2 = 0; + bouncerSpriteId = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].healthboxBounceSpriteId].sBouncerSpriteId; + DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].healthboxBounceSpriteId]); + gBattleSpritesDataPtr->healthBoxesData[battler].healthboxIsBouncing = 0; } else { - if (!gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4) + if (!gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing) return; - r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_3].data[3]; - DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_3]); - gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4 = 0; + bouncerSpriteId = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].battlerBounceSpriteId].sBouncerSpriteId; + DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].battlerBounceSpriteId]); + gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing = 0; } - gSprites[r4].pos2.x = 0; - gSprites[r4].pos2.y = 0; + + gSprites[bouncerSpriteId].pos2.x = 0; + gSprites[bouncerSpriteId].pos2.y = 0; } -static void SpriteCB_HealthBoxBounce(struct Sprite *sprite) +static void SpriteCB_BounceEffect(struct Sprite *sprite) { - u8 spriteId = sprite->data[3]; - s32 var; + u8 bouncerSpriteId = sprite->sBouncerSpriteId; + s32 index; - if (sprite->data[4] == 1) - var = sprite->data[0]; + if (sprite->sWhich == BOUNCE_HEALTHBOX) + index = sprite->sSinIndex; else - var = sprite->data[0]; + index = sprite->sSinIndex; - gSprites[spriteId].pos2.y = Sin(var, sprite->data[2]) + sprite->data[2]; - sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; + gSprites[bouncerSpriteId].pos2.y = Sin(index, sprite->sAmplitude) + sprite->sAmplitude; + sprite->sSinIndex = (sprite->sSinIndex + sprite->sDelta) & 0xFF; } +#undef sSinIndex +#undef sDelta +#undef sAmplitude +#undef sBouncerSpriteId +#undef sWhich + void sub_8039E44(struct Sprite *sprite) { if (sprite->affineAnimEnded) @@ -4272,7 +4286,7 @@ static void HandleTurnActionSelectionState(void) if (gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_MULTIPLETURNS || gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_RECHARGE) { - BtlController_EmitCmd50(0); + BtlController_EmitEndBounceEffect(0); MarkBattlerForControllerExec(gActiveBattler); return; } @@ -4300,7 +4314,7 @@ static void HandleTurnActionSelectionState(void) { RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 3); } - BtlController_EmitCmd50(0); + BtlController_EmitEndBounceEffect(0); MarkBattlerForControllerExec(gActiveBattler); return; } @@ -4439,7 +4453,7 @@ static void HandleTurnActionSelectionState(void) gHitMarker |= HITMARKER_RUN; gBattleCommunication[gActiveBattler]++; break; - case B_ACTION_UNKNOWN9: + case B_ACTION_WALLY_THROW: gBattleCommunication[gActiveBattler]++; break; } @@ -5776,7 +5790,7 @@ static void HandleAction_SafriZoneRun(void) gBattleOutcome = B_OUTCOME_RAN; } -static void HandleAction_Action9(void) +static void HandleAction_WallyBallThrow(void) { gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index b0388e971..78b615407 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -38,7 +38,7 @@ struct HallofFameMon struct HallofFameTeam { - struct HallofFameMon mon[6]; + struct HallofFameMon mon[PARTY_SIZE]; }; struct HofGfx -- cgit v1.2.3 From 272b98da6c5174db3f7f2d05ed765fc4cdefc2c6 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 28 Jun 2018 21:06:32 +0200 Subject: document party status summary --- asm/macros/battle_script.inc | 2 +- asm/party_menu.s | 2 +- asm/pokemon_summary_screen.s | 2 +- data/battle_scripts_1.s | 8 +- data/battle_scripts_2.s | 10 +-- include/battle.h | 18 ++-- include/battle_controllers.h | 6 +- include/battle_interface.h | 2 +- src/battle_controller_link_opponent.c | 16 ++-- src/battle_controller_link_partner.c | 16 ++-- src/battle_controller_opponent.c | 16 ++-- src/battle_controller_player.c | 20 ++--- src/battle_controller_player_partner.c | 16 ++-- src/battle_controller_recorded_opponent.c | 16 ++-- src/battle_controller_recorded_player.c | 16 ++-- src/battle_controller_safari.c | 6 +- src/battle_controller_wally.c | 12 +-- src/battle_controllers.c | 18 ++-- src/battle_interface.c | 12 +-- src/battle_main.c | 136 +++++++++++++++--------------- src/battle_script_commands.c | 22 ++--- src/battle_util.c | 10 +-- src/safari_zone.c | 10 +-- 23 files changed, 196 insertions(+), 196 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 083107c08..73fcbeac1 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -525,7 +525,7 @@ .byte \bank .endm - .macro atk62 bank + .macro hidepartystatussummary bank .byte 0x62 .byte \bank .endm diff --git a/asm/party_menu.s b/asm/party_menu.s index 6e2b1e55a..782d8ae31 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -12158,7 +12158,7 @@ sub_81B672C: @ 81B672C bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - bl sub_805EAE8 + bl HandleBattleLowHpMusicChange ldr r1, =gTasks lsls r0, r5, 2 adds r0, r5 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 901669715..e52874f57 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -1116,7 +1116,7 @@ sub_81C4778: @ 81C4778 bne _081C47AE adds r0, r1, 0 adds r0, 0xC - bl ShouldPlayNormalPokeCry + bl ShouldPlayNormalMonCry cmp r0, 0x1 bne _081C47A4 ldrh r0, [r4, 0x2] diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 058833fa9..a9d305ec8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2899,7 +2899,7 @@ BattleScript_FaintedMonTryChooseAnother:: switchindataupdate BS_ATTACKER hpthresholds BS_ATTACKER printstring STRINGID_SWITCHINMON - atk62 BS_ATTACKER + hidepartystatussummary BS_ATTACKER switchinanim BS_ATTACKER, 0x0 waitstate switchineffects BS_ATTACKER @@ -2910,7 +2910,7 @@ BattleScript_FaintedMonChooseAnother:: switchindataupdate BS_FAINTED hpthresholds BS_FAINTED printstring STRINGID_SWITCHINMON - atk62 BS_FAINTED + hidepartystatussummary BS_FAINTED switchinanim BS_FAINTED, FALSE waitstate various7 BS_ATTACKER @@ -2933,7 +2933,7 @@ BattleScript_82DA908:: switchindataupdate BS_FAINTED hpthresholds BS_FAINTED printstring STRINGID_SWITCHINMON - atk62 BS_FAINTED + hidepartystatussummary BS_FAINTED switchinanim BS_FAINTED, FALSE waitstate switchineffects 5 @@ -3136,7 +3136,7 @@ BattleScript_DoSwitchOut:: switchindataupdate BS_ATTACKER hpthresholds BS_ATTACKER printstring STRINGID_SWITCHINMON - atk62 BS_ATTACKER + hidepartystatussummary BS_ATTACKER switchinanim BS_ATTACKER, FALSE waitstate switchineffects BS_ATTACKER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 8020d7c5c..1fbaa9536 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -44,7 +44,7 @@ gBattlescriptsForSafariActions:: @ 82DBD58 .4byte BattleScript_ActionWatchesCarefully .4byte BattleScript_ActionGetNear .4byte BattleScript_ActionThrowPokeblock - .4byte BattleScript_82DBEE3 + .4byte BattleScript_ActionWallyThrow BattleScript_BallThrow:: jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally @@ -176,17 +176,17 @@ BattleScript_RunByUsingItem:: setbyte gBattleOutcome, B_OUTCOME_RAN finishturn -BattleScript_ActionWatchesCarefully:: +BattleScript_ActionWatchesCarefully: printstring STRINGID_PKMNWATCHINGCAREFULLY waitmessage 0x40 end2 -BattleScript_ActionGetNear:: +BattleScript_ActionGetNear: printfromtable gSafariGetNearStringIds waitmessage 0x40 end2 -BattleScript_ActionThrowPokeblock:: +BattleScript_ActionThrowPokeblock: printstring STRINGID_THREWPOKEBLOCKATPKMN waitmessage 0x40 playanimation BS_ATTACKER, B_ANIM_x4, NULL @@ -194,7 +194,7 @@ BattleScript_ActionThrowPokeblock:: waitmessage 0x40 end2 -BattleScript_82DBEE3:: +BattleScript_ActionWallyThrow: printstring STRINGID_RETURNMON waitmessage 0x40 returnatktoball diff --git a/include/battle.h b/include/battle.h index 2651407fb..20a6cf1b8 100644 --- a/include/battle.h +++ b/include/battle.h @@ -336,20 +336,20 @@ struct BattleResults u8 unk5_0:1; // 0x5 u8 usedMasterBall:1; // 0x5 u8 caughtMonBall:4; // 0x5 - u8 unk5_6:1; // 0x5 + u8 shinyWildMon:1; // 0x5 u8 unk5_7:1; // 0x5 u16 playerMon1Species; // 0x6 - u8 playerMon1Name[11]; // 0x8 + u8 playerMon1Name[POKEMON_NAME_LENGTH + 1]; // 0x8 u8 battleTurnCounter; // 0x13 - u8 playerMon2Name[11]; // 0x14 - u8 field_1F; // 0x1F + u8 playerMon2Name[POKEMON_NAME_LENGTH + 1]; // 0x14 + u8 pokeblockThrows; // 0x1F u16 lastOpponentSpecies; // 0x20 u16 lastUsedMovePlayer; // 0x22 u16 lastUsedMoveOpponent; // 0x24 u16 playerMon2Species; // 0x26 u16 caughtMonSpecies; // 0x28 - u8 caughtMonNick[10]; // 0x2A - u8 filler34[2]; // 0x34 + u8 caughtMonNick[POKEMON_NAME_LENGTH + 1]; // 0x2A + u8 filler35[1]; // 0x35 u8 catchAttempts[11]; // 0x36 }; @@ -663,13 +663,13 @@ struct BattleAnimationInfo struct BattleHealthboxInfo { - u8 flag_x1:1; + u8 partyStatusSummaryShown:1; u8 healthboxIsBouncing:1; u8 battlerIsBouncing:1; u8 ballAnimActive:1; // 0x8 u8 statusAnimActive:1; // x10 u8 animFromTableActive:1; // x20 - u8 specialAnimActive:1; //x40 + u8 specialAnimActive:1; // x40 u8 flag_x80:1; u8 field_1_x1:1; u8 field_1_x1E:4; @@ -733,7 +733,7 @@ extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT]; extern u8 gBattlerPositions[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; -extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT]; +extern u8 gBattlerByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gCurrentTurnActionNumber; extern u8 gCurrentActionFuncId; extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT]; diff --git a/include/battle_controllers.h b/include/battle_controllers.h index c5f5f48d7..61e2935b7 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -160,7 +160,7 @@ enum CONTROLLER_INTROSLIDE, CONTROLLER_INTROTRAINERBALLTHROW, CONTROLLER_DRAWPARTYSTATUSSUMMARY, - CONTROLLER_49, + CONTROLLER_HIDEPARTYSTATUSSUMMARY, CONTROLLER_ENDBOUNCE, CONTROLLER_SPRITEINVISIBILITY, CONTROLLER_BATTLEANIMATION, @@ -230,13 +230,13 @@ void BtlController_EmitFaintingCry(u8 bufferId); void BtlController_EmitIntroSlide(u8 bufferId, u8 terrainId); void BtlController_EmitIntroTrainerBallThrow(u8 bufferId); void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2); -void BtlController_EmitCmd49(u8 bufferId); +void BtlController_EmitHidePartyStatusSummary(u8 bufferId); void BtlController_EmitEndBounceEffect(u8 bufferId); void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible); void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument); void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2); void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId); -void BtlController_EmitCmd55(u8 bufferId, u8 arg1); +void BtlController_EmitCmd55(u8 bufferId, u8 battleOutcome); // player controller void SetControllerToPlayer(void); diff --git a/include/battle_interface.h b/include/battle_interface.h index b917d2cb3..2d93811f1 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -72,7 +72,7 @@ void InitBattlerHealthboxCoords(u8 bank); void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent); void SwapHpBarsWithHpText(void); u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart); -void sub_8073C30(u8 taskId); +void Task_HidePartyStatusSummary(u8 taskId); void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId); s32 MoveBattleBar(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3); u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 0a53c2893..aa98b179d 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -89,7 +89,7 @@ static void LinkOpponentHandleFaintingCry(void); static void LinkOpponentHandleIntroSlide(void); static void LinkOpponentHandleIntroTrainerBallThrow(void); static void LinkOpponentHandleDrawPartyStatusSummary(void); -static void LinkOpponentHandleCmd49(void); +static void LinkOpponentHandleHidePartyStatusSummary(void); static void LinkOpponentHandleEndBounceEffect(void); static void LinkOpponentHandleSpriteInvisibility(void); static void LinkOpponentHandleBattleAnimation(void); @@ -161,7 +161,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkOpponentHandleIntroSlide, LinkOpponentHandleIntroTrainerBallThrow, LinkOpponentHandleDrawPartyStatusSummary, - LinkOpponentHandleCmd49, + LinkOpponentHandleHidePartyStatusSummary, LinkOpponentHandleEndBounceEffect, LinkOpponentHandleSpriteInvisibility, LinkOpponentHandleBattleAnimation, @@ -1716,8 +1716,8 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_8067618, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_28; @@ -1762,7 +1762,7 @@ static void LinkOpponentHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; if (gBattleBufferA[gActiveBattler][2] != 0) { @@ -1796,10 +1796,10 @@ static void sub_806782C(void) } } -static void LinkOpponentHandleCmd49(void) +static void LinkOpponentHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; LinkOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index f5987c0ce..be9609e62 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -87,7 +87,7 @@ static void LinkPartnerHandleFaintingCry(void); static void LinkPartnerHandleIntroSlide(void); static void LinkPartnerHandleIntroTrainerBallThrow(void); static void LinkPartnerHandleDrawPartyStatusSummary(void); -static void LinkPartnerHandleCmd49(void); +static void LinkPartnerHandleHidePartyStatusSummary(void); static void LinkPartnerHandleEndBounceEffect(void); static void LinkPartnerHandleSpriteInvisibility(void); static void LinkPartnerHandleBattleAnimation(void); @@ -158,7 +158,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkPartnerHandleIntroSlide, LinkPartnerHandleIntroTrainerBallThrow, LinkPartnerHandleDrawPartyStatusSummary, - LinkPartnerHandleCmd49, + LinkPartnerHandleHidePartyStatusSummary, LinkPartnerHandleEndBounceEffect, LinkPartnerHandleSpriteInvisibility, LinkPartnerHandleBattleAnimation, @@ -1564,8 +1564,8 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_814DCCC, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_112; @@ -1611,7 +1611,7 @@ static void LinkPartnerHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0; @@ -1631,10 +1631,10 @@ static void sub_814DE9C(void) } } -static void LinkPartnerHandleCmd49(void) +static void LinkPartnerHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; LinkPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 83dac5436..414e084ee 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -94,7 +94,7 @@ static void OpponentHandleFaintingCry(void); static void OpponentHandleIntroSlide(void); static void OpponentHandleIntroTrainerBallThrow(void); static void OpponentHandleDrawPartyStatusSummary(void); -static void OpponentHandleCmd49(void); +static void OpponentHandleHidePartyStatusSummary(void); static void OpponentHandleEndBounceEffect(void); static void OpponentHandleSpriteInvisibility(void); static void OpponentHandleBattleAnimation(void); @@ -166,7 +166,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = OpponentHandleIntroSlide, OpponentHandleIntroTrainerBallThrow, OpponentHandleDrawPartyStatusSummary, - OpponentHandleCmd49, + OpponentHandleHidePartyStatusSummary, OpponentHandleEndBounceEffect, OpponentHandleSpriteInvisibility, OpponentHandleBattleAnimation, @@ -1865,8 +1865,8 @@ static void OpponentHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_8062828, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_26; @@ -1916,7 +1916,7 @@ static void OpponentHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; if (gBattleBufferA[gActiveBattler][2] != 0) { @@ -1950,10 +1950,10 @@ static void sub_8062A2C(void) } } -static void OpponentHandleCmd49(void) +static void OpponentHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; OpponentBufferExecCompleted(); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 63dc989be..86775f50e 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -100,7 +100,7 @@ static void PlayerHandleFaintingCry(void); static void PlayerHandleIntroSlide(void); static void PlayerHandleIntroTrainerBallThrow(void); static void PlayerHandleDrawPartyStatusSummary(void); -static void PlayerHandleCmd49(void); +static void PlayerHandleHidePartyStatusSummary(void); static void PlayerHandleEndBounceEffect(void); static void PlayerHandleSpriteInvisibility(void); static void PlayerHandleBattleAnimation(void); @@ -187,7 +187,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerHandleIntroSlide, PlayerHandleIntroTrainerBallThrow, PlayerHandleDrawPartyStatusSummary, - PlayerHandleCmd49, + PlayerHandleHidePartyStatusSummary, PlayerHandleEndBounceEffect, PlayerHandleSpriteInvisibility, PlayerHandleBattleAnimation, @@ -253,7 +253,7 @@ static void HandleInputChooseAction(void) DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1); DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1); - if (gMain.newAndRepeatedKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2) + if (gMain.newAndRepeatedKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) gPlayerDpadHoldFrames++; else gPlayerDpadHoldFrames = 0; @@ -485,7 +485,7 @@ static void HandleInputChooseMove(void) bool32 canSelectTarget = FALSE; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]); - if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2) + if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A) gPlayerDpadHoldFrames++; else gPlayerDpadHoldFrames = 0; @@ -2945,8 +2945,8 @@ static void PlayerHandleIntroTrainerBallThrow(void) taskId = CreateTask(task05_08033660, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_21; @@ -3003,7 +3003,7 @@ static void PlayerHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0; @@ -3023,10 +3023,10 @@ static void sub_805CE38(void) } } -static void PlayerHandleCmd49(void) +static void PlayerHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; PlayerBufferExecCompleted(); } diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 17ed1c24f..6a70200b6 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -87,7 +87,7 @@ static void PlayerPartnerHandleFaintingCry(void); static void PlayerPartnerHandleIntroSlide(void); static void PlayerPartnerHandleIntroTrainerBallThrow(void); static void PlayerPartnerHandleDrawPartyStatusSummary(void); -static void PlayerPartnerHandleCmd49(void); +static void PlayerPartnerHandleHidePartyStatusSummary(void); static void PlayerPartnerHandleEndBounceEffect(void); static void PlayerPartnerHandleSpriteInvisibility(void); static void PlayerPartnerHandleBattleAnimation(void); @@ -164,7 +164,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerPartnerHandleIntroSlide, PlayerPartnerHandleIntroTrainerBallThrow, PlayerPartnerHandleDrawPartyStatusSummary, - PlayerPartnerHandleCmd49, + PlayerPartnerHandleHidePartyStatusSummary, PlayerPartnerHandleEndBounceEffect, PlayerPartnerHandleSpriteInvisibility, PlayerPartnerHandleBattleAnimation, @@ -1810,8 +1810,8 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_81BE2C8, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_77; @@ -1857,7 +1857,7 @@ static void PlayerPartnerHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0; @@ -1877,10 +1877,10 @@ static void sub_81BE498(void) } } -static void PlayerPartnerHandleCmd49(void) +static void PlayerPartnerHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; PlayerPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 9d213fc6b..4b44116dd 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -90,7 +90,7 @@ static void RecordedOpponentHandleFaintingCry(void); static void RecordedOpponentHandleIntroSlide(void); static void RecordedOpponentHandleIntroTrainerBallThrow(void); static void RecordedOpponentHandleDrawPartyStatusSummary(void); -static void RecordedOpponentHandleCmd49(void); +static void RecordedOpponentHandleHidePartyStatusSummary(void); static void RecordedOpponentHandleEndBounceEffect(void); static void RecordedOpponentHandleSpriteInvisibility(void); static void RecordedOpponentHandleBattleAnimation(void); @@ -162,7 +162,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void RecordedOpponentHandleIntroSlide, RecordedOpponentHandleIntroTrainerBallThrow, RecordedOpponentHandleDrawPartyStatusSummary, - RecordedOpponentHandleCmd49, + RecordedOpponentHandleHidePartyStatusSummary, RecordedOpponentHandleEndBounceEffect, RecordedOpponentHandleSpriteInvisibility, RecordedOpponentHandleBattleAnimation, @@ -1658,8 +1658,8 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_8189548, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_70; @@ -1704,7 +1704,7 @@ static void RecordedOpponentHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; if (gBattleBufferA[gActiveBattler][2] != 0) { @@ -1738,10 +1738,10 @@ static void sub_818975C(void) } } -static void RecordedOpponentHandleCmd49(void) +static void RecordedOpponentHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; RecordedOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index d1836c092..b6a96b6fd 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -89,7 +89,7 @@ static void RecordedPlayerHandleFaintingCry(void); static void RecordedPlayerHandleIntroSlide(void); static void RecordedPlayerHandleIntroTrainerBallThrow(void); static void RecordedPlayerHandleDrawPartyStatusSummary(void); -static void RecordedPlayerHandleCmd49(void); +static void RecordedPlayerHandleHidePartyStatusSummary(void); static void RecordedPlayerHandleEndBounceEffect(void); static void RecordedPlayerHandleSpriteInvisibility(void); static void RecordedPlayerHandleBattleAnimation(void); @@ -160,7 +160,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) RecordedPlayerHandleIntroSlide, RecordedPlayerHandleIntroTrainerBallThrow, RecordedPlayerHandleDrawPartyStatusSummary, - RecordedPlayerHandleCmd49, + RecordedPlayerHandleHidePartyStatusSummary, RecordedPlayerHandleEndBounceEffect, RecordedPlayerHandleSpriteInvisibility, RecordedPlayerHandleBattleAnimation, @@ -1693,8 +1693,8 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_818CC24, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_120; @@ -1740,7 +1740,7 @@ static void RecordedPlayerHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0; @@ -1760,10 +1760,10 @@ static void sub_818CDF4(void) } } -static void RecordedPlayerHandleCmd49(void) +static void RecordedPlayerHandleHidePartyStatusSummary(void) { - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; RecordedPlayerBufferExecCompleted(); } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 3cdd952ef..bc69e2624 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -80,7 +80,7 @@ static void SafariHandleFaintingCry(void); static void SafariHandleIntroSlide(void); static void SafariHandleIntroTrainerBallThrow(void); static void SafariHandleDrawPartyStatusSummary(void); -static void SafariHandleCmd49(void); +static void SafariHandleHidePartyStatusSummary(void); static void SafariHandleEndBounceEffect(void); static void SafariHandleSpriteInvisibility(void); static void SafariHandleBattleAnimation(void); @@ -144,7 +144,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) = SafariHandleIntroSlide, SafariHandleIntroTrainerBallThrow, SafariHandleDrawPartyStatusSummary, - SafariHandleCmd49, + SafariHandleHidePartyStatusSummary, SafariHandleEndBounceEffect, SafariHandleSpriteInvisibility, SafariHandleBattleAnimation, @@ -645,7 +645,7 @@ static void SafariHandleDrawPartyStatusSummary(void) SafariBufferExecCompleted(); } -static void SafariHandleCmd49(void) +static void SafariHandleHidePartyStatusSummary(void) { SafariBufferExecCompleted(); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 05c7b9e1f..5399ccbf0 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -90,7 +90,7 @@ static void WallyHandleFaintingCry(void); static void WallyHandleIntroSlide(void); static void WallyHandleIntroTrainerBallThrow(void); static void WallyHandleDrawPartyStatusSummary(void); -static void WallyHandleCmd49(void); +static void WallyHandleHidePartyStatusSummary(void); static void WallyHandleEndBounceEffect(void); static void WallyHandleSpriteInvisibility(void); static void WallyHandleBattleAnimation(void); @@ -159,7 +159,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = WallyHandleIntroSlide, WallyHandleIntroTrainerBallThrow, WallyHandleDrawPartyStatusSummary, - WallyHandleCmd49, + WallyHandleHidePartyStatusSummary, WallyHandleEndBounceEffect, WallyHandleSpriteInvisibility, WallyHandleBattleAnimation, @@ -1450,8 +1450,8 @@ static void WallyHandleIntroTrainerBallThrow(void) taskId = CreateTask(sub_816AC04, 5); gTasks[taskId].data[0] = gActiveBattler; - if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1) - gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30; + if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) + gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; gBattleSpritesDataPtr->animationData->field_9_x1 = 1; gBattlerControllerFuncs[gActiveBattler] = nullsub_21; @@ -1511,13 +1511,13 @@ static void WallyHandleDrawPartyStatusSummary(void) } else { - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown = 1; gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]); WallyBufferExecCompleted(); } } -static void WallyHandleCmd49(void) +static void WallyHandleHidePartyStatusSummary(void) { WallyBufferExecCompleted(); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 1c60e22ef..4da941ab0 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1449,17 +1449,17 @@ void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* h sBattleBuffersTransferData[1] = arg2 & 0x7F; sBattleBuffersTransferData[2] = (arg2 & 0x80) >> 7; sBattleBuffersTransferData[3] = CONTROLLER_DRAWPARTYSTATUSSUMMARY; - for (i = 0; i < (s32)(sizeof(struct HpAndStatus) * 6); i++) + for (i = 0; i < (s32)(sizeof(struct HpAndStatus) * PARTY_SIZE); i++) sBattleBuffersTransferData[4 + i] = *(i + (u8*)(hpAndStatus)); - PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct HpAndStatus) * 6 + 4); + PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct HpAndStatus) * PARTY_SIZE + 4); } -void BtlController_EmitCmd49(u8 bufferId) +void BtlController_EmitHidePartyStatusSummary(u8 bufferId) { - sBattleBuffersTransferData[0] = CONTROLLER_49; - sBattleBuffersTransferData[1] = CONTROLLER_49; - sBattleBuffersTransferData[2] = CONTROLLER_49; - sBattleBuffersTransferData[3] = CONTROLLER_49; + sBattleBuffersTransferData[0] = CONTROLLER_HIDEPARTYSTATUSSUMMARY; + sBattleBuffersTransferData[1] = CONTROLLER_HIDEPARTYSTATUSSUMMARY; + sBattleBuffersTransferData[2] = CONTROLLER_HIDEPARTYSTATUSSUMMARY; + sBattleBuffersTransferData[3] = CONTROLLER_HIDEPARTYSTATUSSUMMARY; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } @@ -1511,10 +1511,10 @@ void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 2); } -void BtlController_EmitCmd55(u8 bufferId, u8 arg1) +void BtlController_EmitCmd55(u8 bufferId, u8 battleOutcome) { sBattleBuffersTransferData[0] = CONTROLLER_55; - sBattleBuffersTransferData[1] = arg1; + sBattleBuffersTransferData[1] = battleOutcome; sBattleBuffersTransferData[2] = gSaveBlock2Ptr->field_CA9_b; sBattleBuffersTransferData[3] = gSaveBlock2Ptr->field_CA9_b; sBattleBuffersTransferData[5] = sBattleBuffersTransferData[4] = sub_81850DC(&sBattleBuffersTransferData[6]); diff --git a/src/battle_interface.c b/src/battle_interface.c index f5e031cb9..6a30ed487 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1695,7 +1695,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, return taskId; } -void sub_8073C30(u8 taskId) +void Task_HidePartyStatusSummary(u8 taskId) { u8 ballIconSpriteIds[PARTY_SIZE]; bool8 isBattleStart; @@ -1707,7 +1707,7 @@ void sub_8073C30(u8 taskId) summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; battlerId = gTasks[taskId].tBattler; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); @@ -1755,12 +1755,12 @@ static void sub_8073E08(u8 taskId) { if ((gTasks[taskId].data[11]++ % 2) == 0) { - if (--gTasks[taskId].data[15] < 0) + if (--gTasks[taskId].tData15 < 0) return; SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[15]) | ((16 - gTasks[taskId].data[15]) << 8)); } - if (gTasks[taskId].data[15] == 0) + if (gTasks[taskId].tData15 == 0) gTasks[taskId].func = sub_8073E64; } @@ -1796,7 +1796,7 @@ static void sub_8073E64(u8 taskId) } else if (gTasks[taskId].tData15 == -3) { - gBattleSpritesDataPtr->healthBoxesData[battlerId].flag_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[battlerId].partyStatusSummaryShown = 0; SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyTask(taskId); @@ -1828,7 +1828,7 @@ static void sub_8073F98(u8 taskId) } else if (gTasks[taskId].tData15 == -3) { - gBattleSpritesDataPtr->healthBoxesData[battlerId].flag_x1 = 0; + gBattleSpritesDataPtr->healthBoxesData[battlerId].partyStatusSummaryShown = 0; SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyTask(taskId); diff --git a/src/battle_main.c b/src/battle_main.c index 9afbc7f40..a0d812a94 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -82,15 +82,15 @@ extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE2; extern u8 gUnknown_0203CF00[]; -extern const u16 gBattleTextboxPalette[]; // battle textbox palette +extern const u16 gBattleTextboxPalette[]; extern const struct BgTemplate gBattleBgTemplates[]; -extern const struct WindowTemplate * const gBattleWindowTemplates[]; +extern const struct WindowTemplate *const gBattleWindowTemplates[]; extern const u8 gUnknown_0831ACE0[]; -extern const u8 * const gBattleScriptsForMoveEffects[]; -extern const u8 * const gBattlescriptsForBallThrow[]; -extern const u8 * const gBattlescriptsForRunningByItem[]; -extern const u8 * const gBattlescriptsForUsingItem[]; -extern const u8 * const gBattlescriptsForSafariActions[]; +extern const u8 *const gBattleScriptsForMoveEffects[]; +extern const u8 *const gBattlescriptsForBallThrow[]; +extern const u8 *const gBattlescriptsForRunningByItem[]; +extern const u8 *const gBattlescriptsForUsingItem[]; +extern const u8 *const gBattlescriptsForSafariActions[]; extern const struct ScanlineEffectParams gUnknown_0831AC70; // strings @@ -206,7 +206,7 @@ EWRAM_DATA u8 gBattlersCount = 0; EWRAM_DATA u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u8 gBattlerPositions[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT] = {0}; -EWRAM_DATA u8 gBattleTurnOrder[MAX_BATTLERS_COUNT] = {0}; +EWRAM_DATA u8 gBattlerByTurnOrder[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u8 gCurrentTurnActionNumber = 0; EWRAM_DATA u8 gCurrentActionFuncId = 0; EWRAM_DATA struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT] = {0}; @@ -3067,7 +3067,7 @@ static void BattleStartClearSetData(void) for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - *(gBattleStruct->AI_monToSwitchIntoId + i) = 6; + *(gBattleStruct->AI_monToSwitchIntoId + i) = PARTY_SIZE; } gBattleStruct->field_DF = 0; @@ -3079,7 +3079,7 @@ static void BattleStartClearSetData(void) for (i = 0; i < sizeof(struct BattleResults); i++) dataPtr[i] = 0; - gBattleResults.unk5_6 = IsMonShiny(&gEnemyParty[0]); + gBattleResults.shinyWildMon = IsMonShiny(&gEnemyParty[0]); gBattleStruct->field_2A0 = 0; gBattleStruct->field_2A1 = 0; @@ -3427,7 +3427,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) static void BattleIntroDrawPartySummaryScreens(void) { s32 i; - struct HpAndStatus hpStatus[6]; + struct HpAndStatus hpStatus[PARTY_SIZE]; if (gBattleControllerExecFlags) return; @@ -3478,7 +3478,7 @@ static void BattleIntroDrawPartySummaryScreens(void) // wild battles don't show the party summary. // Still, there's no point in having dead code. - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) @@ -3848,12 +3848,12 @@ static void TryDoEventsBeforeFirstTurn(void) if (gBattleStruct->switchInAbilitiesCounter == 0) { for (i = 0; i < gBattlersCount; i++) - gBattleTurnOrder[i] = i; + gBattlerByTurnOrder[i] = i; for (i = 0; i < gBattlersCount - 1; i++) { for (j = i + 1; j < gBattlersCount; j++) { - if (GetWhoStrikesFirst(gBattleTurnOrder[i], gBattleTurnOrder[j], TRUE) != 0) + if (GetWhoStrikesFirst(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], TRUE) != 0) SwapTurnOrder(i, j); } } @@ -3864,10 +3864,10 @@ static void TryDoEventsBeforeFirstTurn(void) gBattleStruct->overworldWeatherDone = TRUE; return; } - // check all switch in abilities happening from the fastest mon to slowest + // Check all switch in abilities happening from the fastest mon to slowest. while (gBattleStruct->switchInAbilitiesCounter < gBattlersCount) { - if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBattleTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0) + if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBattlerByTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0) effect++; gBattleStruct->switchInAbilitiesCounter++; @@ -3879,10 +3879,10 @@ static void TryDoEventsBeforeFirstTurn(void) return; if (AbilityBattleEffects(ABILITYEFFECT_TRACE, 0, 0, 0, 0) != 0) return; - // check all switch in items having effect from the fastest mon to slowest + // Check all switch in items having effect from the fastest mon to slowest. while (gBattleStruct->switchInItemsCounter < gBattlersCount) { - if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBattleTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0) + if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBattlerByTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0) effect++; gBattleStruct->switchInItemsCounter++; @@ -3892,7 +3892,7 @@ static void TryDoEventsBeforeFirstTurn(void) } for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - *(gBattleStruct->monToSwitchIntoId + i) = 6; + *(gBattleStruct->monToSwitchIntoId + i) = PARTY_SIZE; gChosenActionByBattler[i] = B_ACTION_NONE; gChosenMoveByBattler[i] = MOVE_NONE; } @@ -3958,15 +3958,15 @@ void BattleTurnPassed(void) TurnValuesCleanUp(TRUE); if (gBattleOutcome == 0) { - if (UpdateTurnCounters() != 0) + if (UpdateTurnCounters()) return; - if (TurnBasedEffects() != 0) + if (TurnBasedEffects()) return; } - if (HandleFaintedMonActions() != 0) + if (HandleFaintedMonActions()) return; gBattleStruct->faintedActionsState = 0; - if (HandleWishPerishSongOnTurnEnd() != 0) + if (HandleWishPerishSongOnTurnEnd()) return; TurnValuesCleanUp(FALSE); @@ -4003,7 +4003,7 @@ void BattleTurnPassed(void) } for (i = 0; i < 4; i++) - *(gBattleStruct->monToSwitchIntoId + i) = 6; + *(gBattleStruct->monToSwitchIntoId + i) = PARTY_SIZE; *(&gBattleStruct->field_91) = gAbsentBattlerFlags; BattlePutTextOnWindow(gText_EmptyString3, 0); @@ -4141,11 +4141,11 @@ static void HandleTurnActionSelectionState(void) gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; break; case STATE_BEFORE_ACTION_CHOSEN: // choose an action - *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6; + *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; if (gBattleTypeFlags & BATTLE_TYPE_MULTI - || !(position & BIT_FLANK) + || (position & BIT_FLANK) == B_FLANK_LEFT || gBattleStruct->field_91 & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(position))] - || gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(position))] == 5) + || gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(position))] == STATE_WAIT_ACTION_CONFIRMED) { if (gBattleStruct->field_91 & gBitTable[gActiveBattler]) { @@ -4415,7 +4415,7 @@ static void HandleTurnActionSelectionState(void) } break; case B_ACTION_SWITCH: - if (gBattleBufferB[gActiveBattler][1] == 6) + if (gBattleBufferB[gActiveBattler][1] == PARTY_SIZE) { gBattleCommunication[gActiveBattler] = 1; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); @@ -4591,9 +4591,9 @@ void SwapTurnOrder(u8 id1, u8 id2) gActionsByTurnOrder[id1] = gActionsByTurnOrder[id2]; gActionsByTurnOrder[id2] = temp; - temp = gBattleTurnOrder[id1]; - gBattleTurnOrder[id1] = gBattleTurnOrder[id2]; - gBattleTurnOrder[id2] = temp; + temp = gBattlerByTurnOrder[id1]; + gBattlerByTurnOrder[id1] = gBattlerByTurnOrder[id2]; + gBattlerByTurnOrder[id2] = temp; } u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) @@ -4753,16 +4753,16 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) static void SetActionsAndBattlersTurnOrder(void) { - s32 var = 0; + s32 turnOrderId = 0; s32 i, j; if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) { for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) { - gActionsByTurnOrder[var] = gChosenActionByBattler[gActiveBattler]; - gBattleTurnOrder[var] = gActiveBattler; - var++; + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; + gBattlerByTurnOrder[turnOrderId] = gActiveBattler; + turnOrderId++; } } else @@ -4773,7 +4773,7 @@ static void SetActionsAndBattlersTurnOrder(void) { if (gChosenActionByBattler[gActiveBattler] == B_ACTION_RUN) { - var = 5; + turnOrderId = 5; break; } } @@ -4783,27 +4783,27 @@ static void SetActionsAndBattlersTurnOrder(void) if (gChosenActionByBattler[0] == B_ACTION_RUN) { gActiveBattler = 0; - var = 5; + turnOrderId = 5; } if (gChosenActionByBattler[2] == B_ACTION_RUN) { gActiveBattler = 2; - var = 5; + turnOrderId = 5; } } - if (var == 5) + if (turnOrderId == 5) // One of battlers wants to run. { gActionsByTurnOrder[0] = gChosenActionByBattler[gActiveBattler]; - gBattleTurnOrder[0] = gActiveBattler; - var = 1; + gBattlerByTurnOrder[0] = gActiveBattler; + turnOrderId = 1; for (i = 0; i < gBattlersCount; i++) { if (i != gActiveBattler) { - gActionsByTurnOrder[var] = gChosenActionByBattler[i]; - gBattleTurnOrder[var] = i; - var++; + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[i]; + gBattlerByTurnOrder[turnOrderId] = i; + turnOrderId++; } } gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts; @@ -4816,26 +4816,26 @@ static void SetActionsAndBattlersTurnOrder(void) { if (gChosenActionByBattler[gActiveBattler] == B_ACTION_USE_ITEM || gChosenActionByBattler[gActiveBattler] == B_ACTION_SWITCH) { - gActionsByTurnOrder[var] = gChosenActionByBattler[gActiveBattler]; - gBattleTurnOrder[var] = gActiveBattler; - var++; + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; + gBattlerByTurnOrder[turnOrderId] = gActiveBattler; + turnOrderId++; } } for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) { if (gChosenActionByBattler[gActiveBattler] != B_ACTION_USE_ITEM && gChosenActionByBattler[gActiveBattler] != B_ACTION_SWITCH) { - gActionsByTurnOrder[var] = gChosenActionByBattler[gActiveBattler]; - gBattleTurnOrder[var] = gActiveBattler; - var++; + gActionsByTurnOrder[turnOrderId] = gChosenActionByBattler[gActiveBattler]; + gBattlerByTurnOrder[turnOrderId] = gActiveBattler; + turnOrderId++; } } for (i = 0; i < gBattlersCount - 1; i++) { for (j = i + 1; j < gBattlersCount; j++) { - u8 battler1 = gBattleTurnOrder[i]; - u8 battler2 = gBattleTurnOrder[j]; + u8 battler1 = gBattlerByTurnOrder[i]; + u8 battler2 = gBattlerByTurnOrder[j]; if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM && gActionsByTurnOrder[i] != B_ACTION_SWITCH @@ -4882,7 +4882,7 @@ static void TurnValuesCleanUp(bool8 var0) } if (gDisableStructs[gActiveBattler].substituteHP == 0) - gBattleMons[gActiveBattler].status2 &= ~(STATUS2_SUBSTITUTE); + gBattleMons[gActiveBattler].status2 &= ~(STATUS2_SUBSTITUTE); } gSideTimers[0].followmeTimer = 0; @@ -5136,7 +5136,7 @@ static void HandleEndTurn_FinishBattle(void) | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_WALLY_TUTORIAL)) - && gBattleResults.unk5_6) + && gBattleResults.shinyWildMon) { sub_80EE184(); } @@ -5268,7 +5268,7 @@ static void HandleAction_UseMove(void) u8 side; u8 var = 4; - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; if (*(&gBattleStruct->field_91) & gBitTable[gBattlerAttacker]) { @@ -5400,7 +5400,7 @@ static void HandleAction_UseMove(void) } else { - gActiveBattler = gBattleTurnOrder[var]; + gActiveBattler = gBattlerByTurnOrder[var]; RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability); gSpecialStatuses[gActiveBattler].lightningRodRedirected = 1; gBattlerTarget = gActiveBattler; @@ -5482,7 +5482,7 @@ static void HandleAction_UseMove(void) static void HandleAction_Switch(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gActionSelectionCursor[gBattlerAttacker] = 0; @@ -5500,7 +5500,7 @@ static void HandleAction_Switch(void) static void HandleAction_UseItem(void) { - gBattlerAttacker = gBattlerTarget = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerTarget = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; ClearFuryCutterDestinyBondGrudge(gBattlerAttacker); @@ -5659,7 +5659,7 @@ bool8 TryRunFromBattle(u8 battler) static void HandleAction_Run(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) { @@ -5713,7 +5713,7 @@ static void HandleAction_Run(void) static void HandleAction_WatchesCarefully(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0]; @@ -5722,7 +5722,7 @@ static void HandleAction_WatchesCarefully(void) static void HandleAction_SafariZoneBallThrow(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gNumSafariBalls--; @@ -5733,14 +5733,14 @@ static void HandleAction_SafariZoneBallThrow(void) static void HandleAction_ThrowPokeblock(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1; gLastUsedItem = gBattleBufferB[gBattlerAttacker][2]; - if (gBattleResults.field_1F < 0xFF) - gBattleResults.field_1F++; + if (gBattleResults.pokeblockThrows < 0xFF) + gBattleResults.pokeblockThrows++; if (gBattleStruct->field_7A < 3) gBattleStruct->field_7A++; if (gBattleStruct->field_7B > 1) @@ -5757,7 +5757,7 @@ static void HandleAction_ThrowPokeblock(void) static void HandleAction_GoNear(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -5784,7 +5784,7 @@ static void HandleAction_GoNear(void) static void HandleAction_SafriZoneRun(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; PlaySE(SE_NIGERU); gCurrentTurnActionNumber = gBattlersCount; gBattleOutcome = B_OUTCOME_RAN; @@ -5792,7 +5792,7 @@ static void HandleAction_SafriZoneRun(void) static void HandleAction_WallyBallThrow(void) { - gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -5825,7 +5825,7 @@ static void HandleAction_NothingIsFainted(void) static void HandleAction_ActionFinished(void) { - *(gBattleStruct->monToSwitchIntoId + gBattleTurnOrder[gCurrentTurnActionNumber]) = 6; + *(gBattleStruct->monToSwitchIntoId + gBattlerByTurnOrder[gCurrentTurnActionNumber]) = 6; gCurrentTurnActionNumber++; gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber]; SpecialStatusesClear(); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c26e5ac11..fb77ab4c4 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -188,7 +188,7 @@ static void atk5E(void); static void atk5F(void); static void atk60_incrementgamestat(void); static void atk61_drawpartystatussummary(void); -static void atk62(void); +static void atk62_hidepartystatussummary(void); static void atk63_jumptorandomattack(void); static void atk64_statusanimation(void); static void atk65_status2animation(void); @@ -440,7 +440,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atk5F, atk60_incrementgamestat, atk61_drawpartystatussummary, - atk62, + atk62_hidepartystatussummary, atk63_jumptorandomattack, atk64_statusanimation, atk65_status2animation, @@ -989,11 +989,11 @@ static void atk00_attackcanceler(void) for (i = 0; i < gBattlersCount; i++) { - if ((gProtectStructs[gBattleTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) + if ((gProtectStructs[gBattlerByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) { - PressurePPLose(gBattlerAttacker, gBattleTurnOrder[i], MOVE_SNATCH); - gProtectStructs[gBattleTurnOrder[i]].stealMove = 0; - gBattleScripting.battler = gBattleTurnOrder[i]; + PressurePPLose(gBattlerAttacker, gBattlerByTurnOrder[i], MOVE_SNATCH); + gProtectStructs[gBattlerByTurnOrder[i]].stealMove = 0; + gBattleScripting.battler = gBattlerByTurnOrder[i]; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SnatchedMove; return; @@ -2216,7 +2216,7 @@ u8 GetBattlerTurnOrderNum(u8 battlerId) s32 i; for (i = 0; i < gBattlersCount; i++) { - if (gBattleTurnOrder[i] == battlerId) + if (gBattlerByTurnOrder[i] == battlerId) break; } return i; @@ -5556,7 +5556,7 @@ static void atk52_switchineffects(void) for (i = 0; i < gBattlersCount; i++) { - if (gBattleTurnOrder[i] == gActiveBattler) + if (gBattlerByTurnOrder[i] == gActiveBattler) gActionsByTurnOrder[i] = B_ACTION_CANCEL_PARTNER; } @@ -6021,10 +6021,10 @@ static void atk61_drawpartystatussummary(void) gBattlescriptCurrInstr += 2; } -static void atk62(void) +static void atk62_hidepartystatussummary(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - BtlController_EmitCmd49(0); + BtlController_EmitHidePartyStatusSummary(0); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; @@ -8957,7 +8957,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void) for (i = 0; i < gBattlersCount; i++) { - if (gBattleTurnOrder[i] == gBattlerTarget) + if (gBattlerByTurnOrder[i] == gBattlerTarget) gActionsByTurnOrder[i] = 11; } diff --git a/src/battle_util.c b/src/battle_util.c index 172ec6659..b9a7f546a 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -511,14 +511,14 @@ u8 UpdateTurnCounters(void) case 0: for (i = 0; i < gBattlersCount; i++) { - gBattleTurnOrder[i] = i; + gBattlerByTurnOrder[i] = i; } for (i = 0; i < gBattlersCount - 1; i++) { s32 j; for (j = i + 1; j < gBattlersCount; j++) { - if (GetWhoStrikesFirst(gBattleTurnOrder[i], gBattleTurnOrder[j], 0)) + if (GetWhoStrikesFirst(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], 0)) SwapTurnOrder(i, j); } } @@ -632,7 +632,7 @@ u8 UpdateTurnCounters(void) case 5: while (gBattleStruct->turnSideTracker < gBattlersCount) { - gActiveBattler = gBattleTurnOrder[gBattleStruct->turnSideTracker]; + gActiveBattler = gBattlerByTurnOrder[gBattleStruct->turnSideTracker]; if (gWishFutureKnock.wishCounter[gActiveBattler] != 0 && --gWishFutureKnock.wishCounter[gActiveBattler] == 0 && gBattleMons[gActiveBattler].hp != 0) @@ -755,7 +755,7 @@ u8 TurnBasedEffects(void) gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); while (gBattleStruct->turnEffectsBattlerId < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE) { - gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->turnEffectsBattlerId]; + gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->turnEffectsBattlerId]; if (gAbsentBattlerFlags & gBitTable[gActiveBattler]) { gBattleStruct->turnEffectsBattlerId++; @@ -1121,7 +1121,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) case 1: while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount) { - gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->wishPerishSongBattlerId]; + gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->wishPerishSongBattlerId]; if (gAbsentBattlerFlags & gBitTable[gActiveBattler]) { gBattleStruct->wishPerishSongBattlerId++; diff --git a/src/safari_zone.c b/src/safari_zone.c index ab5c38f3a..c0c098b38 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -42,7 +42,7 @@ extern void PlayerGetDestCoords(s16* x, s16* y); EWRAM_DATA u8 gNumSafariBalls = 0; EWRAM_DATA static u16 sSafariZoneStepCounter = 0; EWRAM_DATA static u8 sSafariZoneCaughtMons = 0; -EWRAM_DATA static u8 sSafariZoneFleedMons = 0; +EWRAM_DATA static u8 sSafariZonePkblkUses = 0; EWRAM_DATA static struct PokeblockFeeder sPokeblockFeeders[NUM_POKEBLOCK_FEEDERS] = {0}; static void ClearAllPokeblockFeeders(void); @@ -71,12 +71,12 @@ void EnterSafariMode(void) gNumSafariBalls = 30; sSafariZoneStepCounter = 500; sSafariZoneCaughtMons = 0; - sSafariZoneFleedMons = 0; + sSafariZonePkblkUses = 0; } void ExitSafariMode(void) { - sub_80EE44C(sSafariZoneCaughtMons, sSafariZoneFleedMons); + sub_80EE44C(sSafariZoneCaughtMons, sSafariZonePkblkUses); ResetSafariZoneFlag(); ClearAllPokeblockFeeders(); gNumSafariBalls = 0; @@ -107,7 +107,7 @@ void SafariZoneRetirePrompt(void) void CB2_EndSafariBattle(void) { - sSafariZoneFleedMons += gBattleResults.field_1F; + sSafariZonePkblkUses += gBattleResults.pokeblockThrows; if (gBattleOutcome == B_OUTCOME_CAUGHT) sSafariZoneCaughtMons++; if (gNumSafariBalls != 0) @@ -172,7 +172,7 @@ void GetPokeblockFeederWithinRange(void) { if (gSaveBlock1Ptr->location.mapNum == sPokeblockFeeders[i].mapNum) { - //Get absolute value of x and y distance from Pokeblock feeder on current map + // Get absolute value of x and y distance from Pokeblock feeder on current map. x -= sPokeblockFeeders[i].x; y -= sPokeblockFeeders[i].y; if (x < 0) -- cgit v1.2.3 From 30c85a5128b2b68049ce7b62d8beb64adad26b64 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:12:17 +0200 Subject: more battle documentation --- asm/macros/battle_script.inc | 4 ++-- data/battle_scripts_1.s | 14 ++++++------ include/constants/battle.h | 2 +- src/battle_main.c | 1 + src/battle_message.c | 51 ++++++++++++++++++++++---------------------- src/battle_script_commands.c | 39 +++++++++++++++++---------------- 6 files changed, 56 insertions(+), 55 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 73fcbeac1..c03d78df7 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -511,7 +511,7 @@ .byte \bank .endm - .macro atk5F + .macro swapattackerwithtarget .byte 0x5f .endm @@ -1163,7 +1163,7 @@ .4byte \param0 .endm - .macro snatchsetbanks + .macro snatchsetbattlers .byte 0xed .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a9d305ec8..4956ffc13 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2873,7 +2873,7 @@ BattleScript_FaintedMonTryChooseAnother:: jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother - jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother @@ -2968,7 +2968,7 @@ BattleScript_PayDayMoneyAndPickUpItems:: BattleScript_LocalBattleLost:: jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew - jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText + jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd @@ -3120,10 +3120,10 @@ BattleScript_PursuitSwitchDmgSetMultihit:: setmultihit 0x2 BattleScript_PursuitSwitchDmgLoop:: jumpifnopursuitswitchdmg BattleScript_DoSwitchOut - atk5F + swapattackerwithtarget trysetdestinybondtohappen call BattleScript_PursuitDmgOnSwitchOut - atk5F + swapattackerwithtarget BattleScript_DoSwitchOut:: decrementmultihit BattleScript_PursuitSwitchDmgLoop switchoutabilities BS_ATTACKER @@ -3230,7 +3230,7 @@ BattleScript_DamagingWeatherContinues:: playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL setbyte gBattleCommunication, 0x0 BattleScript_DamagingWeatherLoop:: - copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1 + copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 0x1 weatherdamage jumpifword CMP_EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement printfromtable gSandStormHailDmgStringIds @@ -3710,12 +3710,12 @@ BattleScript_MagicCoatBounce:: BattleScript_SnatchedMove:: attackstring ppreduce - snatchsetbanks + snatchsetbattlers playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL printstring STRINGID_PKMNSNATCHEDMOVE waitmessage 0x40 orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000 - atk5F + swapattackerwithtarget return BattleScript_EnduredMsg:: diff --git a/include/constants/battle.h b/include/constants/battle.h index f3d7a8e0e..5a09067ad 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -159,7 +159,7 @@ #define HITMARKER_NO_ATTACKSTRING 0x00000200 #define HITMARKER_ATTACKSTRING_PRINTED 0x00000400 #define HITMARKER_NO_PPDEDUCT 0x00000800 -#define HITMARKER_PURSUIT_TRAP 0x00001000 +#define HITMARKER_SWAP_ATTACKER_TARGET 0x00001000 #define HITMARKER_IGNORE_SAFEGUARD 0x00002000 #define HITMARKER_SYNCHRONISE_EFFECT 0x00004000 #define HITMARKER_RUN 0x00008000 diff --git a/src/battle_main.c b/src/battle_main.c index a0d812a94..a846f5769 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -561,6 +561,7 @@ static const u8 sUnknown_0831BCE0[][3] = {{0, 0, 0}, {3, 5, 0}, {2, 3, 0}, {1, 2 static const u8 sUnknown_0831BCEF[] = {4, 3, 2, 1}; static const u8 sUnknown_0831BCF3[] = {4, 4, 4, 4}; +// code void CB2_InitBattle(void) { MoveSaveBlocks_ResetHeap(); diff --git a/src/battle_message.c b/src/battle_message.c index 896b2197e..41b36ae13 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -45,7 +45,6 @@ extern const u8 gText_PkmnBoxLanettesPCFull[]; extern const u8 gText_PkmnTransferredSomeonesPC[]; extern const u8 gText_PkmnTransferredLanettesPC[]; -extern u16 sub_8068BB0(void); // pokemon_1 extern u8 sub_81A4D00(void); // battle_frontier_2 extern u8 GetFrontierOpponentClass(u16 trainerId); // battle_tower extern u8 sub_81D5530(u16 trainerId); // pokenav @@ -58,8 +57,8 @@ extern void sub_81D572C(u8 arg0, u16 trainerId); // pokenav extern void GetFrontierTrainerName(u8 *dst, u16 trainerId); // this file's functions -static void sub_814F8F8(u8 *textPtr); -static void sub_814F950(u8 *dst); +static void ChooseMoveUsedParticle(u8 *textPtr); +static void ChooseTypeOfMoveUsedString(u8 *dst); static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst); // ewram variables @@ -1322,8 +1321,8 @@ static const u8 sText_LinkTrainerWantsToBattlePause[] = _("{B_20}\nwants to batt static const u8 sText_TwoLinkTrainersWantToBattlePause[] = _("{B_20} and {B_21}\nwant to battle!{PAUSE 49}"); // This is four lists of moves which use a different attack string in Japanese -// to the default. See the documentation for sub_814F950 for more detail. -static const u16 sUnknownMoveTable[] = +// to the default. See the documentation for ChooseTypeOfMoveUsedString for more detail. +static const u16 sGrammarMoveUsedTable[] = { MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_GROWTH, MOVE_HARDEN, MOVE_MINIMIZE, MOVE_SMOKESCREEN, @@ -2142,14 +2141,14 @@ void BufferStringBattle(u16 stringID) } break; case STRINGID_USEDMOVE: // pokemon used a move msg - sub_814F8F8(gBattleTextBuff1); // buff1 doesn't appear in the string, leftover from japanese move names? + ChooseMoveUsedParticle(gBattleTextBuff1); // buff1 doesn't appear in the string, leftover from japanese move names if (gStringInfo->currentMove > LAST_MOVE_INDEX) StringCopy(gBattleTextBuff2, sATypeMove_Table[*(&gBattleStruct->stringMoveType)]); else StringCopy(gBattleTextBuff2, gMoveNames[gStringInfo->currentMove]); - sub_814F950(gBattleTextBuff2); + ChooseTypeOfMoveUsedString(gBattleTextBuff2); stringPtr = sText_AttackerUsedX; break; case STRINGID_BATTLEEND: // battle end @@ -2740,10 +2739,6 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) return dstID; } -// TODO: move these to a general header like util.h -#define ByteRead16(ptr) ((ptr)[0] | ((ptr)[1] << 8)) -#define ByteRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24) - static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) { u32 srcID = 1; @@ -2757,7 +2752,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) switch (src[srcID]) { case B_BUFF_STRING: // battle string - hword = ByteRead16(&src[srcID + 1]); + hword = T1_READ_16(&src[srcID + 1]); StringAppend(dst, gBattleStringsTable[hword - BATTLESTRINGS_ID_ADDER]); srcID += 3; break; @@ -2768,17 +2763,17 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) value = src[srcID + 3]; break; case 2: - value = ByteRead16(&src[srcID + 3]); + value = T1_READ_16(&src[srcID + 3]); break; case 4: - value = ByteRead32(&src[srcID + 3]); + value = T1_READ_32(&src[srcID + 3]); break; } ConvertIntToDecimalStringN(dst, value, 0, src[srcID + 2]); srcID += src[srcID + 1] + 3; break; case B_BUFF_MOVE: // move name - StringAppend(dst, gMoveNames[ByteRead16(&src[srcID + 1])]); + StringAppend(dst, gMoveNames[T1_READ_16(&src[srcID + 1])]); srcID += 3; break; case B_BUFF_TYPE: // type name @@ -2808,7 +2803,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) srcID += 2; break; case B_BUFF_SPECIES: // species name - GetSpeciesName(dst, ByteRead16(&src[srcID + 1])); + GetSpeciesName(dst, T1_READ_16(&src[srcID + 1])); srcID += 3; break; case B_BUFF_MON_NICK: // poke nick without prefix @@ -2828,7 +2823,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) srcID += 2; break; case B_BUFF_ITEM: // item name - hword = ByteRead16(&src[srcID + 1]); + hword = T1_READ_16(&src[srcID + 1]); if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) { if (hword == ITEM_ENIGMA_BERRY) @@ -2839,13 +2834,19 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) StringAppend(dst, sText_BerrySuffix); } else + { StringAppend(dst, sText_EnigmaBerry); + } } else + { CopyItemName(hword, dst); + } } else + { CopyItemName(hword, dst); + } srcID += 3; break; } @@ -2854,18 +2855,18 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) // Loads one of two text strings into the provided buffer. This is functionally // unused, since the value loaded into the buffer is not read; it loaded one of -// two particles (either "は" or "の") which works in tandem with sub_814F950 +// two particles (either "は" or "の") which works in tandem with ChooseTypeOfMoveUsedString // below to effect changes in the meaning of the line. -static void sub_814F8F8(u8* textBuff) +static void ChooseMoveUsedParticle(u8* textBuff) { s32 counter = 0; u32 i = 0; while (counter != 4) { - if (sUnknownMoveTable[i] == 0) + if (sGrammarMoveUsedTable[i] == 0) counter++; - if (sUnknownMoveTable[i++] == gStringInfo->currentMove) + if (sGrammarMoveUsedTable[i++] == gStringInfo->currentMove) break; } @@ -2879,7 +2880,7 @@ static void sub_814F8F8(u8* textBuff) } // Appends "!" to the text buffer `dst`. In the original Japanese this looked -// into the table of moves at sUnknownMoveTable and varied the line accordingly. +// into the table of moves at sGrammarMoveUsedTable and varied the line accordingly. // // sText_ExclamationMark was a plain "!", used for any attack not on the list. // It resulted in the translation "'s !". @@ -2896,7 +2897,7 @@ static void sub_814F8F8(u8* textBuff) // // sText_ExclamationMark5 was " こうげき！" This resulted in a translation of // "'s attack!". -static void sub_814F950(u8* dst) +static void ChooseTypeOfMoveUsedString(u8* dst) { s32 counter = 0; s32 i = 0; @@ -2906,9 +2907,9 @@ static void sub_814F950(u8* dst) while (counter != 4) { - if (sUnknownMoveTable[i] == MOVE_NONE) + if (sGrammarMoveUsedTable[i] == MOVE_NONE) counter++; - if (sUnknownMoveTable[i++] == gStringInfo->currentMove) + if (sGrammarMoveUsedTable[i++] == gStringInfo->currentMove) break; } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index fb77ab4c4..ecba9f934 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -67,7 +67,6 @@ extern bool8 sub_81B1250(void); // ? extern bool8 InBattlePike(void); extern bool8 InBattlePyramid(void); extern u16 GetBattlePyramidPickupItemId(void); -extern u8 Overworld_GetMapTypeOfSaveblockLocation(void); extern u8 sub_813B21C(void); extern u16 get_unknown_box_id(void); @@ -185,7 +184,7 @@ static void atk5B_yesnoboxstoplearningmove(void); static void atk5C_hitanimation(void); static void atk5D_getmoneyreward(void); static void atk5E(void); -static void atk5F(void); +static void atk5F_swapattackerwithtarget(void); static void atk60_incrementgamestat(void); static void atk61_drawpartystatussummary(void); static void atk62_hidepartystatussummary(void); @@ -327,7 +326,7 @@ static void atkE9_setweatherballtype(void); static void atkEA_tryrecycleitem(void); static void atkEB_settypetoterrain(void); static void atkEC_pursuitrelated(void); -static void atkEF_snatchsetbanks(void); +static void atkEF_snatchsetbattlers(void); static void atkEE_removelightscreenreflect(void); static void atkEF_handleballthrow(void); static void atkF0_givecaughtmon(void); @@ -437,7 +436,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atk5C_hitanimation, atk5D_getmoneyreward, atk5E, - atk5F, + atk5F_swapattackerwithtarget, atk60_incrementgamestat, atk61_drawpartystatussummary, atk62_hidepartystatussummary, @@ -579,7 +578,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atkEA_tryrecycleitem, atkEB_settypetoterrain, atkEC_pursuitrelated, - atkEF_snatchsetbanks, + atkEF_snatchsetbattlers, atkEE_removelightscreenreflect, atkEF_handleballthrow, atkF0_givecaughtmon, @@ -1172,7 +1171,7 @@ static void atk01_accuracycheck(void) calc = (calc * 130) / 100; // 1.3 compound eyes boost if (WEATHER_HAS_EFFECT && gBattleMons[gBattlerTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY) calc = (calc * 80) / 100; // 1.2 sand veil loss - if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && type < 9) + if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && IS_MOVE_PHYSICAL(type)) calc = (calc * 80) / 100; // 1.2 hustle loss if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) @@ -4676,12 +4675,12 @@ static void atk49_moveend(void) gBattleScripting.atk49_state++; break; case 14: // This case looks interesting, although I am not certain what it does. Probably fine tunes edge cases. - if (gHitMarker & HITMARKER_PURSUIT_TRAP) + if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET) { gActiveBattler = gBattlerAttacker; gBattlerAttacker = gBattlerTarget; gBattlerTarget = gActiveBattler; - gHitMarker &= ~(HITMARKER_PURSUIT_TRAP); + gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET); } if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED) { @@ -5950,7 +5949,7 @@ static void atk5E(void) if (gBattleControllerExecFlags == 0) { s32 i; - struct BattlePokemon* bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBattler][4]; + struct BattlePokemon *bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBattler][4]; for (i = 0; i < 4; i++) { gBattleMons[gActiveBattler].moves[i] = bufferPoke->moves[i]; @@ -5962,16 +5961,16 @@ static void atk5E(void) } } -static void atk5F(void) +static void atk5F_swapattackerwithtarget(void) { gActiveBattler = gBattlerAttacker; gBattlerAttacker = gBattlerTarget; gBattlerTarget = gActiveBattler; - if (gHitMarker & HITMARKER_PURSUIT_TRAP) - gHitMarker &= ~(HITMARKER_PURSUIT_TRAP); + if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET) + gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET); else - gHitMarker |= HITMARKER_PURSUIT_TRAP; + gHitMarker |= HITMARKER_SWAP_ATTACKER_TARGET; gBattlescriptCurrInstr++; } @@ -5987,8 +5986,8 @@ static void atk60_incrementgamestat(void) static void atk61_drawpartystatussummary(void) { s32 i; - struct Pokemon* party; - struct HpAndStatus hpStatuses[6]; + struct Pokemon *party; + struct HpAndStatus hpStatuses[PARTY_SIZE]; if (gBattleControllerExecFlags) return; @@ -6000,7 +5999,7 @@ static void atk61_drawpartystatussummary(void) else party = gEnemyParty; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) @@ -8595,7 +8594,7 @@ static void atkAE_healpartystatus(void) if (gCurrentMove == MOVE_HEAL_BELL) { - struct Pokemon* party; + struct Pokemon *party; s32 i; gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -8633,7 +8632,7 @@ static void atkAE_healpartystatus(void) } } - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { u16 species = GetMonData(&party[i], MON_DATA_SPECIES2); u8 abilityBit = GetMonData(&party[i], MON_DATA_ALT_ABILITY); @@ -10053,7 +10052,7 @@ static void atkEC_pursuitrelated(void) } } -static void atkEF_snatchsetbanks(void) +static void atkEF_snatchsetbattlers(void) { gEffectBattler = gBattlerAttacker; @@ -10131,7 +10130,7 @@ static void atkEF_handleballthrow(void) ballMultiplier = 10; break; case ITEM_DIVE_BALL: - if (Overworld_GetMapTypeOfSaveblockLocation() == 5) + if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER) ballMultiplier = 35; else ballMultiplier = 10; -- cgit v1.2.3 From bfc64c9689d4518c64ba15cd7d52b9a6149fd218 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 15:35:54 +0200 Subject: C vars sym ewram --- include/battle.h | 7 +++++- include/battle_message.h | 18 ++++++--------- src/battle_main.c | 4 ++++ src/battle_message.c | 58 ++++++++++++++++++++++-------------------------- src/battle_setup.c | 28 +++++++++++------------ src/battle_tv.c | 10 ++++----- src/braille_puzzles.c | 14 ++++++------ src/hall_of_fame.c | 18 +++++++-------- sym_ewram.txt | 21 ++---------------- 9 files changed, 80 insertions(+), 98 deletions(-) diff --git a/include/battle.h b/include/battle.h index 20a6cf1b8..0169dde7c 100644 --- a/include/battle.h +++ b/include/battle.h @@ -4,6 +4,7 @@ // should they be included here or included individually by every file? #include "constants/battle.h" #include "battle_main.h" +#include "battle_message.h" #include "battle_util.h" #include "battle_script_commands.h" #include "battle_ai_switch_items.h" @@ -719,7 +720,11 @@ struct MonSpritesGfx void *field_17C; }; -// all battle variables are declared in battle_main.c +// All battle variables are declared in battle_main.c +extern u8 gDisplayedStringBattle[300]; +extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; +extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; +extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT]; extern u32 gBattleTypeFlags; extern u8 gBattleTerrain; extern u32 gUnknown_02022FF4; diff --git a/include/battle_message.h b/include/battle_message.h index f792ff7b0..cccbae841 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -1,8 +1,9 @@ #ifndef GUARD_BATTLE_MESSAGE_H #define GUARD_BATTLE_MESSAGE_H -// for 0xFD +#define TEXT_BUFF_ARRAY_COUNT 16 +// for 0xFD #define B_TXT_BUFF1 0x0 #define B_TXT_BUFF2 0x1 #define B_TXT_COPY_VAR_1 0x2 @@ -194,7 +195,7 @@ textVar[4] = B_BUFF_EOS; \ } -struct StringInfoBattle +struct BattleMsgData { u16 currentMove; u16 originallyUsedMove; @@ -203,10 +204,10 @@ struct StringInfoBattle u8 scrActive; u8 unk1605E; u8 hpScale; - u8 StringBank; + u8 itemEffectBattler; u8 moveType; - u8 abilities[4]; - u8 textBuffs[3][0x10]; + u8 abilities[MAX_BATTLERS_COUNT]; + u8 textBuffs[3][TEXT_BUFF_ARRAY_COUNT]; }; void BufferStringBattle(u16 stringID); @@ -216,12 +217,7 @@ void BattlePutTextOnWindow(const u8* text, u8 arg1); void SetPpNumbersPaletteInMoveSelection(void); u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp); -#define TEXT_BUFF_ARRAY_COUNT 16 - -extern u8 gDisplayedStringBattle[300]; -extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; -extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; -extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT]; +extern struct BattleMsgData *gBattleMsgDataPtr; extern const u8* const gBattleStringsTable[]; extern const u8* const gStatNamesTable[]; diff --git a/src/battle_main.c b/src/battle_main.c index a846f5769..487e11993 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -190,6 +190,10 @@ static void HandleAction_NothingIsFainted(void); static void HandleAction_ActionFinished(void); // EWRAM vars +EWRAM_DATA u8 gDisplayedStringBattle[300] = {0}; +EWRAM_DATA u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT] = {0}; +EWRAM_DATA u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT] = {0}; +EWRAM_DATA u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT] = {0}; EWRAM_DATA static u32 sUnusedUnknownArray[25] = {0}; EWRAM_DATA u32 gBattleTypeFlags = 0; EWRAM_DATA u8 gBattleTerrain = 0; diff --git a/src/battle_message.c b/src/battle_message.c index 41b36ae13..9dcd4aaf1 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -31,9 +31,7 @@ struct BattleWindowText u8 shadowColor; }; -extern u8 gBattlerAbilities[MAX_BATTLERS_COUNT]; extern u8 gUnknown_0203C7B4; -extern struct StringInfoBattle *gStringInfo; extern const u8 gMoveNames[LAST_MOVE_INDEX + 1][13]; extern const u8 gTrainerClassNames[][13]; @@ -61,11 +59,9 @@ static void ChooseMoveUsedParticle(u8 *textPtr); static void ChooseTypeOfMoveUsedString(u8 *dst); static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst); -// ewram variables -EWRAM_DATA u8 gDisplayedStringBattle[300] = {0}; -EWRAM_DATA u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT] = {0}; -EWRAM_DATA u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT] = {0}; -EWRAM_DATA u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT] = {0}; +// EWRAM vars +static EWRAM_DATA u8 sBattlerAbilities[MAX_BATTLERS_COUNT] = {0}; +EWRAM_DATA struct BattleMsgData *gBattleMsgDataPtr = NULL; // const rom data // todo: make some of those names less vague: attacker/target vs pkmn, etc. @@ -1949,24 +1945,24 @@ void BufferStringBattle(u16 stringID) s32 i; const u8 *stringPtr = NULL; - gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBattler][4]); - gLastUsedItem = gStringInfo->lastItem; - gLastUsedAbility = gStringInfo->lastAbility; - gBattleScripting.battler = gStringInfo->scrActive; - *(&gBattleStruct->field_52) = gStringInfo->unk1605E; - *(&gBattleStruct->hpScale) = gStringInfo->hpScale; - gPotentialItemEffectBattler = gStringInfo->StringBank; - *(&gBattleStruct->stringMoveType) = gStringInfo->moveType; + gBattleMsgDataPtr = (struct BattleMsgData*)(&gBattleBufferA[gActiveBattler][4]); + gLastUsedItem = gBattleMsgDataPtr->lastItem; + gLastUsedAbility = gBattleMsgDataPtr->lastAbility; + gBattleScripting.battler = gBattleMsgDataPtr->scrActive; + *(&gBattleStruct->field_52) = gBattleMsgDataPtr->unk1605E; + *(&gBattleStruct->hpScale) = gBattleMsgDataPtr->hpScale; + gPotentialItemEffectBattler = gBattleMsgDataPtr->itemEffectBattler; + *(&gBattleStruct->stringMoveType) = gBattleMsgDataPtr->moveType; for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - gBattlerAbilities[i] = gStringInfo->abilities[i]; + sBattlerAbilities[i] = gBattleMsgDataPtr->abilities[i]; } for (i = 0; i < TEXT_BUFF_ARRAY_COUNT; i++) { - gBattleTextBuff1[i] = gStringInfo->textBuffs[0][i]; - gBattleTextBuff2[i] = gStringInfo->textBuffs[1][i]; - gBattleTextBuff3[i] = gStringInfo->textBuffs[2][i]; + gBattleTextBuff1[i] = gBattleMsgDataPtr->textBuffs[0][i]; + gBattleTextBuff2[i] = gBattleMsgDataPtr->textBuffs[1][i]; + gBattleTextBuff3[i] = gBattleMsgDataPtr->textBuffs[2][i]; } switch (stringID) @@ -2143,10 +2139,10 @@ void BufferStringBattle(u16 stringID) case STRINGID_USEDMOVE: // pokemon used a move msg ChooseMoveUsedParticle(gBattleTextBuff1); // buff1 doesn't appear in the string, leftover from japanese move names - if (gStringInfo->currentMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->currentMove > LAST_MOVE_INDEX) StringCopy(gBattleTextBuff2, sATypeMove_Table[*(&gBattleStruct->stringMoveType)]); else - StringCopy(gBattleTextBuff2, gMoveNames[gStringInfo->currentMove]); + StringCopy(gBattleTextBuff2, gMoveNames[gBattleMsgDataPtr->currentMove]); ChooseTypeOfMoveUsedString(gBattleTextBuff2); stringPtr = sText_AttackerUsedX; @@ -2431,16 +2427,16 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, gBattlerPartyIndexes[gBattleScripting.battler]) break; case B_TXT_CURRENT_MOVE: // current move name - if (gStringInfo->currentMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->currentMove > LAST_MOVE_INDEX) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else - toCpy = gMoveNames[gStringInfo->currentMove]; + toCpy = gMoveNames[gBattleMsgDataPtr->currentMove]; break; case B_TXT_LAST_MOVE: // originally used move name - if (gStringInfo->originallyUsedMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->originallyUsedMove > LAST_MOVE_INDEX) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else - toCpy = gMoveNames[gStringInfo->originallyUsedMove]; + toCpy = gMoveNames[gBattleMsgDataPtr->originallyUsedMove]; break; case B_TXT_LAST_ITEM: // last used item if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) @@ -2489,16 +2485,16 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = gAbilityNames[gLastUsedAbility]; break; case B_TXT_ATK_ABILITY: // attacker ability - toCpy = gAbilityNames[gBattlerAbilities[gBattlerAttacker]]; + toCpy = gAbilityNames[sBattlerAbilities[gBattlerAttacker]]; break; case B_TXT_DEF_ABILITY: // target ability - toCpy = gAbilityNames[gBattlerAbilities[gBattlerTarget]]; + toCpy = gAbilityNames[sBattlerAbilities[gBattlerTarget]]; break; case B_TXT_SCR_ACTIVE_ABILITY: // scripting active ability - toCpy = gAbilityNames[gBattlerAbilities[gBattleScripting.battler]]; + toCpy = gAbilityNames[sBattlerAbilities[gBattleScripting.battler]]; break; case B_TXT_EFF_ABILITY: // effect battlerId ability - toCpy = gAbilityNames[gBattlerAbilities[gEffectBattler]]; + toCpy = gAbilityNames[sBattlerAbilities[gEffectBattler]]; break; case B_TXT_TRAINER1_CLASS: // trainer class name if (gBattleTypeFlags & BATTLE_TYPE_SECRET_BASE) @@ -2866,7 +2862,7 @@ static void ChooseMoveUsedParticle(u8* textBuff) { if (sGrammarMoveUsedTable[i] == 0) counter++; - if (sGrammarMoveUsedTable[i++] == gStringInfo->currentMove) + if (sGrammarMoveUsedTable[i++] == gBattleMsgDataPtr->currentMove) break; } @@ -2909,7 +2905,7 @@ static void ChooseTypeOfMoveUsedString(u8* dst) { if (sGrammarMoveUsedTable[i] == MOVE_NONE) counter++; - if (sGrammarMoveUsedTable[i++] == gStringInfo->currentMove) + if (sGrammarMoveUsedTable[i++] == gBattleMsgDataPtr->currentMove) break; } diff --git a/src/battle_setup.c b/src/battle_setup.c index ccc36b7c2..b11083929 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1088,14 +1088,14 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) switch (sTrainerBattleMode) { - case 3: + case TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT: TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data); return EventScript_2713C2; - case 4: + case TRAINER_BATTLE_DOUBLE: TrainerBattleLoadArgs(sDoubleBattleParams, data); SetMapVarsToTrainer(); return EventScript_TryDoDoubleTrainerBattle; - case 2: + case TRAINER_BATTLE_CONTINUE_SCRIPT: if (gApproachingTrainerId == 0) { TrainerBattleLoadArgs(sContinueScriptBattleParams, data); @@ -1106,26 +1106,26 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) TrainerBattleLoadArgs(sTrainerBContinueScriptBattleParams, data); } return EventScript_271362; - case 1: + case TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC: TrainerBattleLoadArgs(sContinueScriptBattleParams, data); SetMapVarsToTrainer(); return EventScript_271362; - case 6: - case 8: + case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE: + case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC: TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data); SetMapVarsToTrainer(); return EventScript_TryDoDoubleTrainerBattle; - case 7: + case TRAINER_BATTLE_REMATCH_DOUBLE: TrainerBattleLoadArgs(sDoubleBattleParams, data); SetMapVarsToTrainer(); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); return EventScript_TryDoDoubleRematchBattle; - case 5: + case TRAINER_BATTLE_REMATCH: TrainerBattleLoadArgs(sOrdinaryBattleParams, data); SetMapVarsToTrainer(); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); return EventScript_2713D1; - case 9: + case TRAINER_BATTLE_9: if (gApproachingTrainerId == 0) { TrainerBattleLoadArgs(sOrdinaryBattleParams, data); @@ -1138,13 +1138,13 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) gTrainerBattleOpponent_B = sub_81A9AA8(gSpecialVar_LastTalked); } return EventScript_271362; - case 10: + case TRAINER_BATTLE_SET_TRAINER_A: TrainerBattleLoadArgs(sOrdinaryBattleParams, data); return NULL; - case 11: + case TRAINER_BATTLE_SET_TRAINER_B: TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); return NULL; - case 12: + case TRAINER_BATTLE_12: if (gApproachingTrainerId == 0) { TrainerBattleLoadArgs(sOrdinaryBattleParams, data); @@ -1591,11 +1591,11 @@ static bool32 UpdateRandomTrainerRematches(const struct RematchTrainer *table, u { if (gSaveBlock1Ptr->trainerRematches[i] != 0) { - // Trainer already wants a rematch. Don't bother updating it + // Trainer already wants a rematch. Don't bother updating it. ret = TRUE; } else if (FlagGet(FLAG_MATCH_CALL_REGISTERED + i) - && (Random() % 100) <= 30) // 31% chance of getting a rematch + && (Random() % 100) <= 30) // 31% chance of getting a rematch. { SetRematchIdForTrainer(table, i); ret = TRUE; diff --git a/src/battle_tv.c b/src/battle_tv.c index e5d97be30..cd0490a1b 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -9,8 +9,6 @@ #include "battle_message.h" #include "tv.h" -extern struct StringInfoBattle *gStringInfo; - // this file's functions static bool8 sub_817E0B8(u16 stringId); static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3); @@ -223,7 +221,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) atkSide = GetBattlerSide(gBattlerAttacker); defSide = GetBattlerSide(gBattlerTarget); effSide = GetBattlerSide(gEffectBattler); - scriptingSide = GetBattlerSide(gStringInfo->scrActive); + scriptingSide = GetBattlerSide(gBattleMsgDataPtr->scrActive); if (atkSide == B_SIDE_PLAYER) atkMon = &gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]; @@ -235,7 +233,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) else defMon = &gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]; - moveSlot = GetBattlerMoveSlotId(gBattlerAttacker, gStringInfo->currentMove); + moveSlot = GetBattlerMoveSlotId(gBattlerAttacker, gBattleMsgDataPtr->currentMove); if (moveSlot >= 4 && sub_817E0B8(stringId) && stringId > BATTLESTRINGS_ID_ADDER) { @@ -480,8 +478,8 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_PKMNFASTASLEEP: if (tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMonId != 0 - && gStringInfo->currentMove != MOVE_SNORE - && gStringInfo->currentMove != MOVE_SLEEP_TALK) + && gBattleMsgDataPtr->currentMove != MOVE_SNORE + && gBattleMsgDataPtr->currentMove != MOVE_SLEEP_TALK) AddMovePoints(9, 3, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMoveSlot); break; case STRINGID_PKMNWASFROZEN: diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 35277fe87..91fcf8c46 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -14,7 +14,6 @@ extern void SetCameraPanningCallback(void ( *callback)()); // field_camera extern void InstallCameraPanAheadCallback(void); extern void SetCameraPanning(s16 x, s16 y); extern u8 GetCursorSelectionMonId(void); -extern void FieldEffectActiveListRemove(u8 id); // field_effect extern u8 oei_task_add(void); // why do this, GF? @@ -24,7 +23,8 @@ enum FLY_PUZZLE }; -extern u8 gBraillePuzzleCallbackFlag; +EWRAM_DATA static u8 sBraillePuzzleCallbackFlag = 0; + extern const u8 gUnknown_085EFE74[][2]; void SealedChamberShakingEffect(u8); @@ -208,11 +208,11 @@ bool8 ShouldDoBrailleStrengthEffect(void) if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x06)) { if (gSaveBlock1Ptr->pos.x == 6 && gSaveBlock1Ptr->pos.y == 23) - { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } else if (gSaveBlock1Ptr->pos.x == 5 && gSaveBlock1Ptr->pos.y == 23) - { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } else if (gSaveBlock1Ptr->pos.x == 7 && gSaveBlock1Ptr->pos.y == 23) - { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } } return FALSE; @@ -249,7 +249,7 @@ bool8 ShouldDoBrailleFlyEffect(void) if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44)) { if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 25) - { gBraillePuzzleCallbackFlag = FLY_PUZZLE; return TRUE; } + { sBraillePuzzleCallbackFlag = FLY_PUZZLE; return TRUE; } } return FALSE; } @@ -362,7 +362,7 @@ bool8 FldEff_UsePuzzleEffect(void) { u8 taskId = oei_task_add(); - if (gBraillePuzzleCallbackFlag == FLY_PUZZLE) + if (sBraillePuzzleCallbackFlag == FLY_PUZZLE) { gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16; gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 78b615407..0ed22c1e1 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -33,7 +33,7 @@ struct HallofFameMon u32 personality; u16 species:9; u16 lvl:7; - u8 nick[10]; + u8 nick[POKEMON_NAME_LENGTH]; }; struct HallofFameTeam @@ -49,11 +49,11 @@ struct HofGfx u8 tilemap2[0x1000]; }; +static EWRAM_DATA u32 sUnknown_0203BCD4 = 0; static EWRAM_DATA struct HallofFameTeam *sHofMonPtr = NULL; static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL; extern bool8 gHasHallOfFameRecords; -extern u32 gUnknown_0203BCD4; extern struct MusicPlayerInfo gMPlayInfo_BGM; extern MainCallback gGameContinueCallback; extern u32 gDamagedSaveSectors; @@ -490,7 +490,7 @@ static void Task_Hof_InitMonData(u8 taskId) } } - gUnknown_0203BCD4 = 0; + sUnknown_0203BCD4 = 0; gTasks[taskId].tDisplayedMonId = 0; gTasks[taskId].tPlayerSpriteID = 0xFF; @@ -648,11 +648,11 @@ static void Task_Hof_TryDisplayAnotherMon(u8 taskId) } else { - gUnknown_0203BCD4 |= (0x10000 << gSprites[gTasks[taskId].tMonSpriteId(currPokeID)].oam.paletteNum); + sUnknown_0203BCD4 |= (0x10000 << gSprites[gTasks[taskId].tMonSpriteId(currPokeID)].oam.paletteNum); if (gTasks[taskId].tDisplayedMonId <= 4 && currMon[1].species != SPECIES_NONE) // there is another pokemon to display { gTasks[taskId].tDisplayedMonId++; - BeginNormalPaletteFade(gUnknown_0203BCD4, 0, 12, 12, 0x63B0); + BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, 0x63B0); gSprites[gTasks[taskId].tMonSpriteId(currPokeID)].oam.priority = 1; gTasks[taskId].func = Task_Hof_DisplayMon; } @@ -696,7 +696,7 @@ static void sub_8173DC0(u8 taskId) if (gTasks[taskId].tMonSpriteId(i) != 0xFF) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1; } - BeginNormalPaletteFade(gUnknown_0203BCD4, 0, 12, 12, 0x63B0); + BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, 0x63B0); FillWindowPixelBuffer(0, 0); CopyWindowToVram(0, 3); gTasks[taskId].tFrameCount = 7; @@ -923,7 +923,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId) savedTeams++; currMon = &savedTeams->mon[0]; - gUnknown_0203BCD4 = 0; + sUnknown_0203BCD4 = 0; gTasks[taskId].tCurrMonId = 0; gTasks[taskId].tMonNo = 0; @@ -998,8 +998,8 @@ static void Task_HofPC_PrintMonInfo(u8 taskId) currMonID = gTasks[taskId].tMonSpriteId(gTasks[taskId].tCurrMonId); gSprites[currMonID].oam.priority = 0; - gUnknown_0203BCD4 = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000; - BlendPalettesUnfaded(gUnknown_0203BCD4, 0xC, 0x63B0); + sUnknown_0203BCD4 = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000; + BlendPalettesUnfaded(sUnknown_0203BCD4, 0xC, 0x63B0); currMon = &savedTeams->mon[gTasks[taskId].tCurrMonId]; if (currMon->species != SPECIES_EGG) diff --git a/sym_ewram.txt b/sym_ewram.txt index 7ea9bef79..4dff894f8 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -174,9 +174,7 @@ gBattle_WIN1H: @ 2022E28 gBattle_WIN1V: @ 2022E2A .space 0x2 - .include "src/battle_message.o" .include "src/battle_main.o" - .include "src/pokemon.o" .include "src/random.o" .include "src/daycare.o" @@ -288,9 +286,6 @@ gUnknown_02038BC6: @ 2038BC6 .include "src/field_effect.o" .include "src/scanline_effect.o" .include "src/option_menu.o" - - .align 2 - .include "src/pokedex.o" gTrainerCards: @ 2039B58 @@ -684,12 +679,7 @@ gUnknown_0203AB98: @ 203AB98 .include "src/coins.o" .include "src/battle_transition.o" - -gBattlerAbilities: @ 203ABA4 - .space 0x4 - -gStringInfo: @ 203ABA8 - .space 0x4 + .include "src/battle_message.o" gUnknown_0203ABAC: @ 203ABAC .space 0x4 @@ -740,10 +730,6 @@ gUnknown_0203BC8C: @ 203BC8C .include "src/player_pc.o" .include "src/intro.o" .include "src/field_region_map.o" - -gUnknown_0203BCD4: @ 203BCD4 - .space 0x4 - .include "src/hall_of_fame.o" .include "src/credits.o" .include "src/lottery_corner.o" @@ -751,10 +737,7 @@ gUnknown_0203BCD4: @ 203BCD4 .include "src/berry_tag_screen.o" .include "src/mystery_event_menu.o" .include "src/save_failed_screen.o" - -gBraillePuzzleCallbackFlag: @ 203BD14 - .space 0x4 - + .include "src/braille_puzzles.o" .include "src/pokeblock_feed.o" .include "src/intro_credits_graphics.o" .include "src/recorded_battle.o" -- cgit v1.2.3 From 2d0be91217e0ea16f298bb823e954a4d6f6ff63b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 18:55:34 +0200 Subject: Move all trainer defines to trainers.h and identify frontier brain trainer id --- asm/battle_frontier_2.s | 26 +++++++++++++------------- asm/battle_tower.s | 4 ++-- data/battle_frontier_2.s | 7 +++++-- src/battle_bg.c | 2 +- src/battle_controller_opponent.c | 4 ++-- src/battle_controller_player.c | 19 ++++++++++--------- src/battle_controller_player_partner.c | 11 ++++++----- src/battle_controller_wally.c | 15 ++++++++------- src/battle_main.c | 6 +++--- src/battle_message.c | 20 ++++++++++---------- src/battle_script_commands.c | 6 +++--- src/battle_setup.c | 8 ++++---- src/pokemon.c | 12 ++++++------ src/recorded_battle.c | 14 +++++++------- src/reshow_battle_screen.c | 33 +++++++++++++++++---------------- 15 files changed, 97 insertions(+), 90 deletions(-) diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 02bfe8b3b..e377c1b2b 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -19881,7 +19881,7 @@ sub_81A4CB0: @ 81A4CB0 ands r0, r1 cmp r0, 0 beq _081A4CD0 - bl sub_8185EA0 + bl GetRecordedBattleFrontierFacility lsls r0, 24 lsrs r0, 24 b _081A4CDA @@ -19893,7 +19893,7 @@ _081A4CD0: lsrs r0, 16 _081A4CDA: ldr r2, =gTrainers - ldr r1, =gUnknown_08611D30 + ldr r1, =gFacilityToBrainTrainerId lsls r0, 1 adds r0, r1 ldrh r1, [r0] @@ -19907,8 +19907,8 @@ _081A4CDA: .pool thumb_func_end sub_81A4CB0 - thumb_func_start sub_81A4D00 -sub_81A4D00: @ 81A4D00 + thumb_func_start GetFrontierBrainTrainerClass +GetFrontierBrainTrainerClass: @ 81A4D00 push {lr} ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -19917,7 +19917,7 @@ sub_81A4D00: @ 81A4D00 ands r0, r1 cmp r0, 0 beq _081A4D20 - bl sub_8185EA0 + bl GetRecordedBattleFrontierFacility lsls r0, 24 lsrs r0, 24 b _081A4D2A @@ -19929,7 +19929,7 @@ _081A4D20: lsrs r0, 16 _081A4D2A: ldr r2, =gTrainers - ldr r1, =gUnknown_08611D30 + ldr r1, =gFacilityToBrainTrainerId lsls r0, 1 adds r0, r1 ldrh r1, [r0] @@ -19941,10 +19941,10 @@ _081A4D2A: pop {r1} bx r1 .pool - thumb_func_end sub_81A4D00 + thumb_func_end GetFrontierBrainTrainerClass - thumb_func_start sub_81A4D50 -sub_81A4D50: @ 81A4D50 + thumb_func_start CopyFrontierBrainTrainerName +CopyFrontierBrainTrainerName: @ 81A4D50 push {r4,lr} adds r4, r0, 0 ldr r0, =gBattleTypeFlags @@ -19954,7 +19954,7 @@ sub_81A4D50: @ 81A4D50 ands r0, r1 cmp r0, 0 beq _081A4D70 - bl sub_8185EA0 + bl GetRecordedBattleFrontierFacility lsls r0, 24 lsrs r0, 24 b _081A4D7A @@ -19968,7 +19968,7 @@ _081A4D7A: movs r3, 0 lsls r0, 1 ldr r2, =gTrainers - ldr r1, =gUnknown_08611D30 + ldr r1, =gFacilityToBrainTrainerId adds r0, r1 ldrh r1, [r0] lsls r0, r1, 2 @@ -19991,7 +19991,7 @@ _081A4D90: pop {r0} bx r0 .pool - thumb_func_end sub_81A4D50 + thumb_func_end CopyFrontierBrainTrainerName thumb_func_start sub_81A4DB8 sub_81A4DB8: @ 81A4DB8 @@ -20483,7 +20483,7 @@ sub_81A51A8: @ 81A51A8 ands r0, r1 cmp r0, 0 beq _081A51D4 - bl sub_8185EA0 + bl GetRecordedBattleFrontierFacility lsls r0, 24 lsrs r4, r0, 24 bl sub_8185EAC diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 788061f2b..c3b82a836 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -1479,7 +1479,7 @@ _08162C08: ldr r0, =0x000003fe cmp r4, r0 bne _08162C1C - bl sub_81A4D00 + bl GetFrontierBrainTrainerClass lsls r0, 24 lsrs r0, 24 b _08162D1E @@ -1729,7 +1729,7 @@ _08162E54: cmp r5, r0 bne _08162E68 adds r0, r6, 0 - bl sub_81A4D50 + bl CopyFrontierBrainTrainerName b _08162F62 .pool _08162E68: diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index ce2490579..1fbf2a2e1 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -1,5 +1,6 @@ #include "constants/moves.h" #include "constants/species.h" +#include "constants/trainers.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -1049,8 +1050,10 @@ gUnknown_08611D08:: @ 8611D08 .4byte gUnknown_085EE3C4 .align 1 -gUnknown_08611D30:: @ 8611D30 - .2byte 0x0325, 0x0326, 0x0327, 0x0328, 0x0329, 0x032a, 0x032b, 0x0000 +gFacilityToBrainTrainerId:: @ 8611D30 + .2byte TRAINER_ANABEL, TRAINER_TUCKER, TRAINER_SPENSER + .2byte TRAINER_GRETA, TRAINER_NOLAND, TRAINER_LUCY + .2byte TRAINER_BRANDON .align 2 gUnknown_08611D40:: @ 8611D40 diff --git a/src/battle_bg.c b/src/battle_bg.c index 4895e9643..c5dd727f4 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -478,7 +478,7 @@ void DrawBattleEntryBackground(void) } else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) { - if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == STEVEN_PARTNER_ID) + if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 414e084ee..c37423a72 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1232,7 +1232,7 @@ static void OpponentHandleDrawTrainerPic(void) { trainerPicId = GetSecretBaseTrainerPicIndex(); } - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) + else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { trainerPicId = sub_81A4CB0(); } @@ -1316,7 +1316,7 @@ static void OpponentHandleTrainerSlide(void) { trainerPicId = GetSecretBaseTrainerPicIndex(); } - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) + else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { trainerPicId = sub_81A4CB0(); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 86775f50e..d30d34930 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -15,6 +15,7 @@ #include "constants/songs.h" #include "sound.h" #include "constants/moves.h" +#include "constants/trainers.h" #include "window.h" #include "m4a.h" #include "palette.h" @@ -2259,9 +2260,9 @@ static void DoSwitchOutAnimation(void) } } -// some explanation here -// in emerald it's possible to have a tag battle in the battle frontier facilities with AI -// which use the front sprite for both the player and the partner as opposed to any other battles (including the one with Steven) that use the back pic as well as animate it +// In emerald it's possible to have a tag battle in the battle frontier facilities with AI +// which use the front sprite for both the player and the partner as opposed to any other battles (including the one with Steven) +// that use an animated back pic. static void PlayerHandleDrawTrainerPic(void) { s16 xPos, yPos; @@ -2272,12 +2273,12 @@ static void PlayerHandleDrawTrainerPic(void) if ((gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_LEAF_GREEN) { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + BACK_PIC_RED; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_RED; } else if ((gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_SAPPHIRE) { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + BACK_PIC_RS_BRENDAN; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN; } else { @@ -2296,7 +2297,7 @@ static void PlayerHandleDrawTrainerPic(void) else // first mon xPos = 32; - if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != STEVEN_PARTNER_ID) + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) { xPos = 90; yPos = (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 80; @@ -2314,7 +2315,7 @@ static void PlayerHandleDrawTrainerPic(void) } // Use front pic table for any tag battles unless your partner is Steven. - if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != STEVEN_PARTNER_ID) + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) { trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender); DecompressTrainerFrontPic(trainerPicId, gActiveBattler); @@ -2354,12 +2355,12 @@ static void PlayerHandleTrainerSlide(void) if ((gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_LEAF_GREEN) { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + BACK_PIC_RED; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_RED; } else if ((gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetMultiplayerId()].version & 0xFF) == VERSION_SAPPHIRE) { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + BACK_PIC_RS_BRENDAN; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN; } else { diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 6a70200b6..d7878678a 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -11,6 +11,7 @@ #include "util.h" #include "main.h" #include "constants/songs.h" +#include "constants/trainers.h" #include "sound.h" #include "window.h" #include "m4a.h" @@ -1308,9 +1309,9 @@ static void PlayerPartnerHandleDrawTrainerPic(void) s16 xPos, yPos; u32 trainerPicId; - if (gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { - trainerPicId = BACK_PIC_STEVEN; + trainerPicId = TRAINER_BACK_PIC_STEVEN; xPos = 90; yPos = (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80; } @@ -1322,7 +1323,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void) } // Use back pic only if the partner is Steven - if (gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { DecompressTrainerBackPic(trainerPicId, gActiveBattler); sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); @@ -1793,9 +1794,9 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void) StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1); paletteNum = AllocSpritePalette(0xD6F9); - if (gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { - u8 spriteId = BACK_PIC_STEVEN; + u8 spriteId = TRAINER_BACK_PIC_STEVEN; LoadCompressedPalette(gTrainerBackPicPaletteTable[spriteId].data, 0x100 + paletteNum * 16, 32); } else diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 5399ccbf0..f66a1d773 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -15,6 +15,7 @@ #include "constants/songs.h" #include "sound.h" #include "constants/moves.h" +#include "constants/trainers.h" #include "window.h" #include "m4a.h" #include "palette.h" @@ -1037,11 +1038,11 @@ static void WallyHandleReturnMonToBall(void) static void WallyHandleDrawTrainerPic(void) { - DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBattler); - sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); + DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, gActiveBattler); + sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 80, - 80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords), + 80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords), 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1052,11 +1053,11 @@ static void WallyHandleDrawTrainerPic(void) static void WallyHandleTrainerSlide(void) { - DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBattler); - sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); + DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, gActiveBattler); + sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 80, - 80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords), + 80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords), 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96; @@ -1444,7 +1445,7 @@ static void WallyHandleIntroTrainerBallThrow(void) StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1); paletteNum = AllocSpritePalette(0xD6F8); - LoadCompressedPalette(gTrainerBackPicPaletteTable[BACK_PIC_WALLY].data, 0x100 + paletteNum * 16, 32); + LoadCompressedPalette(gTrainerBackPicPaletteTable[TRAINER_BACK_PIC_WALLY].data, 0x100 + paletteNum * 16, 32); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum; taskId = CreateTask(sub_816AC04, 5); diff --git a/src/battle_main.c b/src/battle_main.c index 487e11993..dfe99e003 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -614,7 +614,7 @@ static void CB2_InitBattleInternal(void) gBattle_WIN0H = 240; - if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != STEVEN_PARTNER_ID) + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) { gBattle_WIN0V = 159; gBattle_WIN1H = 240; @@ -1914,7 +1914,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir s32 i, j; u8 monsCount; - if (trainerNum == SECRET_BASE_OPPONENT) + if (trainerNum == TRAINER_SECRET_BASE) return 0; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & (BATTLE_TYPE_FRONTIER @@ -4982,7 +4982,7 @@ static void HandleEndTurn_BattleWon(void) BattleStopLowHpSound(); gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon; - if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) + if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) PlayBGM(MUS_KACHI3); else PlayBGM(MUS_KACHI1); diff --git a/src/battle_message.c b/src/battle_message.c index 9dcd4aaf1..d2ac6da8c 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -33,7 +33,7 @@ struct BattleWindowText extern u8 gUnknown_0203C7B4; -extern const u8 gMoveNames[LAST_MOVE_INDEX + 1][13]; +extern const u8 gMoveNames[MOVES_COUNT][13]; extern const u8 gTrainerClassNames[][13]; extern const u16 gUnknown_08D85620[]; @@ -43,11 +43,11 @@ extern const u8 gText_PkmnBoxLanettesPCFull[]; extern const u8 gText_PkmnTransferredSomeonesPC[]; extern const u8 gText_PkmnTransferredLanettesPC[]; -extern u8 sub_81A4D00(void); // battle_frontier_2 +extern u8 GetFrontierBrainTrainerClass(void); // battle_frontier_2 extern u8 GetFrontierOpponentClass(u16 trainerId); // battle_tower extern u8 sub_81D5530(u16 trainerId); // pokenav extern u8 GetEreaderTrainerClassId(void); // battle_tower -extern void sub_81A4D50(u8 *txtPtr); // battle_frontier_2 +extern void CopyFrontierBrainTrainerName(u8 *txtPtr); // battle_frontier_2 extern void sub_81D5554(u8 *txtPtr, u16 trainerId); // pokenav extern void GetEreaderTrainerName(u8 *txtPtr); extern void sub_81A36D0(u8 arg0, u16 trainerId); // battle_frontier_2 @@ -2139,7 +2139,7 @@ void BufferStringBattle(u16 stringID) case STRINGID_USEDMOVE: // pokemon used a move msg ChooseMoveUsedParticle(gBattleTextBuff1); // buff1 doesn't appear in the string, leftover from japanese move names - if (gBattleMsgDataPtr->currentMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT) StringCopy(gBattleTextBuff2, sATypeMove_Table[*(&gBattleStruct->stringMoveType)]); else StringCopy(gBattleTextBuff2, gMoveNames[gBattleMsgDataPtr->currentMove]); @@ -2427,13 +2427,13 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, gBattlerPartyIndexes[gBattleScripting.battler]) break; case B_TXT_CURRENT_MOVE: // current move name - if (gBattleMsgDataPtr->currentMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->currentMove >= MOVES_COUNT) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else toCpy = gMoveNames[gBattleMsgDataPtr->currentMove]; break; case B_TXT_LAST_MOVE: // originally used move name - if (gBattleMsgDataPtr->originallyUsedMove > LAST_MOVE_INDEX) + if (gBattleMsgDataPtr->originallyUsedMove >= MOVES_COUNT) toCpy = sATypeMove_Table[gBattleStruct->stringMoveType]; else toCpy = gMoveNames[gBattleMsgDataPtr->originallyUsedMove]; @@ -2501,8 +2501,8 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = gTrainerClassNames[GetSecretBaseTrainerClass()]; else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) toCpy = gTrainerClassNames[sub_8068BB0()]; - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) - toCpy = gTrainerClassNames[sub_81A4D00()]; + else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) + toCpy = gTrainerClassNames[GetFrontierBrainTrainerClass()]; else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) toCpy = gTrainerClassNames[GetFrontierOpponentClass(gTrainerBattleOpponent_A)]; else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) @@ -2525,9 +2525,9 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) { toCpy = gLinkPlayers[multiplayerID ^ BIT_SIDE].name; } - else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) + else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { - sub_81A4D50(text); + CopyFrontierBrainTrainerName(text); toCpy = text; } else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index ecba9f934..9c48b083c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3533,7 +3533,7 @@ static void atk24(void) if (gBattleControllerExecFlags) return; - if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { for (i = 0; i < 3; i++) { @@ -5870,7 +5870,7 @@ static u32 GetTrainerMoneyToGive(u16 trainerId) u32 lastMonLevel = 0; u32 moneyReward = 0; - if (trainerId == SECRET_BASE_OPPONENT) + if (trainerId == TRAINER_SECRET_BASE) { moneyReward = 20 * gBattleResources->secretBase->party.levels[0] * gBattleStruct->moneyMultiplier; } @@ -8124,7 +8124,7 @@ static void atk9E_metronome(void) s32 i; gCurrentMove = (Random() & 0x1FF) + 1; - if (gCurrentMove > LAST_MOVE_INDEX) + if (gCurrentMove >= MOVES_COUNT) continue; for (i = 0; i < 4; i++); // ? diff --git a/src/battle_setup.c b/src/battle_setup.c index b11083929..b2655f731 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -798,7 +798,7 @@ static u8 GetTrainerBattleTransition(void) u8 enemyLevel; u8 playerLevel; - if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) return B_TRANSITION_CHAMPION; if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR) @@ -1305,7 +1305,7 @@ void BattleSetup_StartTrainerBattle(void) static void CB2_EndTrainerBattle(void) { - if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) { SetMainCallback2(CB2_ReturnToFieldContinueScript); } @@ -1329,7 +1329,7 @@ static void CB2_EndTrainerBattle(void) static void CB2_EndRematchBattle(void) { - if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) { SetMainCallback2(CB2_ReturnToFieldContinueScript); } @@ -1497,7 +1497,7 @@ const u8 *GetTrainerALoseText(void) { const u8 *string; - if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) string = GetSecretBaseTrainerLoseText(); else string = sTrainerADefeatSpeech; diff --git a/src/pokemon.c b/src/pokemon.c index 800b7c0cd..a4d62feca 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2488,7 +2488,7 @@ static bool8 ShouldGetStatBadgeBoost(u16 badgeFlag, u8 battlerId) return FALSE; if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) return FALSE; - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) return FALSE; if (FlagGet(badgeFlag)) return TRUE; @@ -5678,7 +5678,7 @@ const u8 *GetTrainerPartnerName(void) { if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { - if (gPartnerTrainerId == STEVEN_PARTNER_ID) + if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { return gTrainers[TRAINER_STEVEN].trainerName; } @@ -5891,15 +5891,15 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality) const u8 *GetTrainerClassNameFromId(u16 trainerId) { - if (trainerId > NO_OF_TRAINERS) - trainerId = 0; + if (trainerId >= TRAINERS_COUNT) + trainerId = TRAINER_NONE; return gTrainerClassNames[gTrainers[trainerId].trainerClass]; } const u8 *GetTrainerNameFromId(u16 trainerId) { - if (trainerId > NO_OF_TRAINERS) - trainerId = 0; + if (trainerId >= TRAINERS_COUNT) + trainerId = TRAINER_NONE; return gTrainers[trainerId].trainerName; } diff --git a/src/recorded_battle.c b/src/recorded_battle.c index eb48ab15a..3a4265895 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -79,7 +79,7 @@ EWRAM_DATA static u16 sUnknown_0203C79C[4] = {0}; EWRAM_DATA static u16 sUnknown_0203C7A4[4] = {0}; EWRAM_DATA static u8 sUnknown_0203C7AC = 0; EWRAM_DATA static u8 sUnknown_0203C7AD = 0; -EWRAM_DATA static u8 sUnknown_0203C7AE = 0; +EWRAM_DATA static u8 sRecordedBattle_FrontierFacility = 0; EWRAM_DATA static u8 sUnknown_0203C7AF = 0; EWRAM_DATA static MainCallback sCallback2_AfterRecordedBattle = NULL; EWRAM_DATA u8 gUnknown_0203C7B4 = 0; @@ -139,7 +139,7 @@ void sub_8184E58(void) if (sUnknown_0203C7AC == 1) { gRecordedBattleRngSeed = gRngValue; - sUnknown_0203C7AE = VarGet(VAR_FRONTIER_FACILITY); + sRecordedBattle_FrontierFacility = VarGet(VAR_FRONTIER_FACILITY); sUnknown_0203C7AF = sub_81A513C(); } else if (sUnknown_0203C7AC == 2) @@ -391,7 +391,7 @@ u32 MoveRecordedBattleToSaveData(void) battleSave->partnerId = gPartnerTrainerId; battleSave->field_4FA = gUnknown_0203C7B4; battleSave->field_4FC = gSaveBlock2Ptr->field_CA9_b; - battleSave->field_4FD = sUnknown_0203C7AE; + battleSave->field_4FD = sRecordedBattle_FrontierFacility; battleSave->field_4FE = sUnknown_0203C7AF; battleSave->battleStyle = gSaveBlock2Ptr->optionsBattleStyle; battleSave->textSpeed = gSaveBlock2Ptr->optionsTextSpeed; @@ -700,7 +700,7 @@ _081854E2:\n\ ldr r5, =0x000004fc\n\ adds r1, r7, r5\n\ strb r0, [r1]\n\ - ldr r0, =sUnknown_0203C7AE\n\ + ldr r0, =sRecordedBattle_FrontierFacility\n\ ldrb r1, [r0]\n\ adds r2, 0x3\n\ adds r0, r7, r2\n\ @@ -1354,7 +1354,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) gPartnerTrainerId = src->partnerId; gUnknown_0203C7B4 = src->field_4FA; sUnknown_0203C7AD = gSaveBlock2Ptr->frontierChosenLvl; - sUnknown_0203C7AE = src->field_4FD; + sRecordedBattle_FrontierFacility = src->field_4FD; sUnknown_0203C7AF = src->field_4FE; sRecordedBattle_BattleStyle = src->battleStyle; sRecordedBattle_TextSpeed = src->textSpeed; @@ -1415,9 +1415,9 @@ static void CB2_RecordedBattle(void) RunTasks(); } -u8 sub_8185EA0(void) +u8 GetRecordedBattleFrontierFacility(void) { - return sUnknown_0203C7AE; + return sRecordedBattle_FrontierFacility; } u8 sub_8185EAC(void) diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 4456e450c..4d5240bc7 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -11,6 +11,7 @@ #include "link.h" #include "sprite.h" #include "constants/species.h" +#include "constants/trainers.h" #include "battle_interface.h" #include "battle_anim.h" #include "data2.h" @@ -144,20 +145,20 @@ static void CB2_ReshowBattleScreenAfterMenu(void) break; case 19: { - u8 opponentBank; + u8 opponentBattler; u16 species; LoadAndCreateEnemyShadowSprites(); - opponentBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBank]], MON_DATA_SPECIES); - SetBattlerShadowSpriteCallback(opponentBank, species); + opponentBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBattler]], MON_DATA_SPECIES); + SetBattlerShadowSpriteCallback(opponentBattler, species); if (IsDoubleBattle()) { - opponentBank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); - species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBank]], MON_DATA_SPECIES); - SetBattlerShadowSpriteCallback(opponentBank, species); + opponentBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); + species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBattler]], MON_DATA_SPECIES); + SetBattlerShadowSpriteCallback(opponentBattler, species); } ActionSelectionCreateCursorAt(gActionSelectionCursor[gBattlerInMenuId], 0); @@ -204,10 +205,10 @@ static bool8 LoadBattlerSpriteGfx(u8 battler) else BattleLoadSubstituteOrMonSpriteGfx(battler, FALSE); } - else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT) // Should be checking position, not battler. DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, battler); - else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == 0) - DecompressTrainerBackPic(BACK_PIC_WALLY, battler); + else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) // Should be checking position, not battler. + DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, battler); else if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute) BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[battler]], battler); else @@ -245,7 +246,7 @@ static void CreateBattlerSprite(u8 battler) if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM) gSprites[gBattlerSpriteIds[battler]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM]; } - else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT) { sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT)); gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50, @@ -255,11 +256,11 @@ static void CreateBattlerSprite(u8 battler) gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; gSprites[gBattlerSpriteIds[battler]].data[0] = battler; } - else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) { - sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(0)); + sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(0)); gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50, - (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords) * 4 + 80, + (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords) * 4 + 80, sub_80A82E4(0)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; @@ -292,9 +293,9 @@ static void CreateHealthboxSprite(u8 battler) { u8 healthboxSpriteId; - if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == 0) + if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT) healthboxSpriteId = CreateSafariPlayerHealthboxSprites(); - else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) return; else healthboxSpriteId = CreateBattlerHealthboxSprites(battler); -- cgit v1.2.3 From d2e47323fe988e430af782c2c10b8e41e7a131b3 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Jul 2018 11:15:42 +0200 Subject: document frontier related --- asm/battle_frontier_2.s | 6 +- asm/battle_tower.s | 2 +- data/battle_ai_scripts.s | 6 +- data/data2b.s | 4 - include/battle.h | 30 +-- include/battle_util.h | 53 +++--- include/constants/abilities.h | 2 + include/constants/battle.h | 2 +- include/constants/battle_frontier.h | 13 ++ include/constants/battle_script_commands.h | 2 +- include/constants/moves.h | 2 +- include/constants/trainers.h | 18 +- include/data/battle_moves.h | 2 +- include/data/text/abilities.h | 4 +- include/pokemon.h | 2 +- include/recorded_battle.h | 2 +- src/battle_ai_script_commands.c | 2 +- src/battle_controller_link_partner.c | 9 +- src/battle_controller_opponent.c | 7 +- src/battle_controller_recorded_opponent.c | 1 + src/battle_controllers.c | 14 +- src/battle_gfx_sfx_util.c | 77 ++++---- src/battle_interface.c | 6 +- src/battle_main.c | 50 ++--- src/battle_message.c | 3 +- src/battle_script_commands.c | 30 +-- src/battle_tv.c | 8 +- src/battle_util.c | 283 +++++++++++++++-------------- src/pokemon.c | 22 +-- src/recorded_battle.c | 116 ++++++------ 30 files changed, 402 insertions(+), 376 deletions(-) create mode 100644 include/constants/battle_frontier.h diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index e377c1b2b..586cc8f05 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -19871,8 +19871,8 @@ _081A4C84: .pool thumb_func_end sub_81A4C30 - thumb_func_start sub_81A4CB0 -sub_81A4CB0: @ 81A4CB0 + thumb_func_start GetFrontierBrainTrainerPicIndex +GetFrontierBrainTrainerPicIndex: @ 81A4CB0 push {lr} ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -19905,7 +19905,7 @@ _081A4CDA: pop {r1} bx r1 .pool - thumb_func_end sub_81A4CB0 + thumb_func_end GetFrontierBrainTrainerPicIndex thumb_func_start GetFrontierBrainTrainerClass GetFrontierBrainTrainerClass: @ 81A4D00 diff --git a/asm/battle_tower.s b/asm/battle_tower.s index c3b82a836..1e07bdb9c 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -1353,7 +1353,7 @@ _08162AD0: ldr r0, =0x000003fe cmp r4, r0 bne _08162AE4 - bl sub_81A4CB0 + bl GetFrontierBrainTrainerPicIndex lsls r0, 24 lsrs r0, 24 b _08162BCA diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 1b4863046..2db1c5728 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -3382,11 +3382,11 @@ AI_Safari_Flee: flee AI_FirstBattle: - if_hp_equal AI_TARGET, 20, BattleAIScript_82DE34D - if_hp_less_than AI_TARGET, 20, BattleAIScript_82DE34D + if_hp_equal AI_TARGET, 20, AI_FirstBattle_Flee + if_hp_less_than AI_TARGET, 20, AI_FirstBattle_Flee end -BattleAIScript_82DE34D: +AI_FirstBattle_Flee: flee AI_Ret: diff --git a/data/data2b.s b/data/data2b.s index 17a44ecbc..de32e9775 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4862,7 +4862,3 @@ gUnknown_0831ACC4:: @ 831ACC4 .align 2 gUnknown_0831ACDC:: @ 831ACDC .4byte gUnknown_0831ACC4 - - .align 2 -gUnknown_0831ACE0:: @ 831ACE0 - .byte 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x00 diff --git a/include/battle.h b/include/battle.h index 0169dde7c..6e941191f 100644 --- a/include/battle.h +++ b/include/battle.h @@ -16,12 +16,6 @@ #define GET_BATTLER_SIDE(battler) (GetBattlerPosition(battler) & BIT_SIDE) #define GET_BATTLER_SIDE2(battler) (GET_BATTLER_POSITION(battler) & BIT_SIDE) -#define TRAINER_OPPONENT_3FE 0x3FE -#define TRAINER_OPPONENT_C00 0xC00 -#define TRAINER_OPPONENT_800 0x800 -#define STEVEN_PARTNER_ID 0xC03 -#define SECRET_BASE_OPPONENT 0x400 - // Battle Actions // These determine what each battler will do in a turn #define B_ACTION_USE_MOVE 0 @@ -429,7 +423,7 @@ struct BattleTv_Mon struct BattleTv { - struct BattleTv_Mon mon[2][6]; // [side][partyId] + struct BattleTv_Mon mon[2][PARTY_SIZE]; // [side][partyId] struct BattleTv_Position pos[2][2]; // [side][flank] struct BattleTv_Side side[2]; // [side] }; @@ -479,10 +473,10 @@ struct BattleStruct u8 runTries; u8 caughtMonNick[11]; u8 field_78; - u8 field_79; - u8 field_7A; - u8 field_7B; - u8 field_7C; + u8 safariGoNearCounter; + u8 safariPkblThrowCounter; + u8 safariEscapeFactor; + u8 safariCatchFactor; u8 field_7D; u8 field_7E; u8 formToChangeInto; @@ -526,7 +520,7 @@ struct BattleStruct u8 AI_itemFlags[2]; u16 choicedMove[MAX_BATTLERS_COUNT]; u16 changedItems[MAX_BATTLERS_COUNT]; - u8 intimidateBank; + u8 intimidateBattler; u8 switchInItemsCounter; u8 field_DA; u8 turnSideTracker; @@ -611,18 +605,6 @@ struct BattleScripting u8 multiplayerId; }; -enum -{ - BACK_PIC_BRENDAN, - BACK_PIC_MAY, - BACK_PIC_RED, - BACK_PIC_LEAF, - BACK_PIC_RS_BRENDAN, - BACK_PIC_RS_MAY, - BACK_PIC_WALLY, - BACK_PIC_STEVEN -}; - // rom_80A5C6C u8 GetBattlerSide(u8 battler); u8 GetBattlerPosition(u8 bank); diff --git a/include/battle_util.h b/include/battle_util.h index 0b5590011..0531966df 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -8,27 +8,27 @@ #define MOVE_LIMITATION_TAUNT (1 << 4) #define MOVE_LIMITATION_IMPRISION (1 << 5) -#define ABILITYEFFECT_ON_SWITCHIN 0x0 -#define ABILITYEFFECT_ENDTURN 0x1 -#define ABILITYEFFECT_MOVES_BLOCK 0x2 -#define ABILITYEFFECT_ABSORBING 0x3 -#define ABILITYEFFECT_CONTACT 0x4 -#define ABILITYEFFECT_IMMUNITY 0x5 -#define ABILITYEFFECT_FORECAST 0x6 -#define ABILITYEFFECT_SYNCHRONIZE 0x7 -#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8 -#define ABILITYEFFECT_INTIMIDATE1 0x9 -#define ABILITYEFFECT_INTIMIDATE2 0xA -#define ABILITYEFFECT_TRACE 0xB -#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC -#define ABILITYEFFECT_CHECK_BANK_SIDE 0xD -#define ABILITYEFFECT_FIELD_SPORT 0xE -#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK 0xF -#define ABILITYEFFECT_COUNT_OTHER_SIDE 0x10 -#define ABILITYEFFECT_COUNT_BANK_SIDE 0x11 -#define ABILITYEFFECT_COUNT_ON_FIELD 0x12 -#define ABILITYEFFECT_CHECK_ON_FIELD 0x13 -#define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF +#define ABILITYEFFECT_ON_SWITCHIN 0x0 +#define ABILITYEFFECT_ENDTURN 0x1 +#define ABILITYEFFECT_MOVES_BLOCK 0x2 +#define ABILITYEFFECT_ABSORBING 0x3 +#define ABILITYEFFECT_CONTACT 0x4 +#define ABILITYEFFECT_IMMUNITY 0x5 +#define ABILITYEFFECT_FORECAST 0x6 +#define ABILITYEFFECT_SYNCHRONIZE 0x7 +#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8 +#define ABILITYEFFECT_INTIMIDATE1 0x9 +#define ABILITYEFFECT_INTIMIDATE2 0xA +#define ABILITYEFFECT_TRACE 0xB +#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC +#define ABILITYEFFECT_CHECK_BATTLER_SIDE 0xD +#define ABILITYEFFECT_FIELD_SPORT 0xE +#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER 0xF +#define ABILITYEFFECT_COUNT_OTHER_SIDE 0x10 +#define ABILITYEFFECT_COUNT_BATTLER_SIDE 0x11 +#define ABILITYEFFECT_COUNT_ON_FIELD 0x12 +#define ABILITYEFFECT_CHECK_ON_FIELD 0x13 +#define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF #define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0)) #define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0)) @@ -39,15 +39,6 @@ #define WEATHER_HAS_EFFECT ((!ABILITY_ON_FIELD(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD(ABILITY_AIR_LOCK))) #define WEATHER_HAS_EFFECT2 ((!ABILITY_ON_FIELD2(ABILITY_CLOUD_NINE) && !ABILITY_ON_FIELD2(ABILITY_AIR_LOCK))) -#define BS_GET_TARGET 0 -#define BS_GET_ATTACKER 1 -#define BS_GET_EFFECT_BANK 2 -#define BS_GET_SCRIPTING_BANK 10 -#define BS_GET_PLAYER1 11 -#define BS_GET_OPPONENT1 12 -#define BS_GET_PLAYER2 13 -#define BS_GET_OPPONENT2 14 - u8 GetBattlerForBattleScript(u8 caseId); void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move); void PressurePPLoseOnUsingPerishSong(u8 bankAtk); @@ -74,7 +65,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void); bool8 HandleFaintedMonActions(void); void TryClearRageStatuses(void); u8 AtkCanceller_UnableToUseMove(void); -bool8 sub_80423F4(u8 battlerId, u8 r1, u8 r2); +bool8 HasNoMonsToSwitch(u8 battlerId, u8 r1, u8 r2); u8 CastformDataTypeChange(u8 battlerId); u8 AbilityBattleEffects(u8 caseID, u8 battlerId, u8 ability, u8 special, u16 moveArg); void BattleScriptExecute(const u8* BS_ptr); diff --git a/include/constants/abilities.h b/include/constants/abilities.h index 4e2c4056c..4ad54c86f 100644 --- a/include/constants/abilities.h +++ b/include/constants/abilities.h @@ -80,4 +80,6 @@ #define ABILITY_CACOPHONY 76 #define ABILITY_AIR_LOCK 77 +#define ABILITIES_COUNT 78 + #endif // GUARD_CONSTANTS_ABILITIES_H diff --git a/include/constants/battle.h b/include/constants/battle.h index 5a09067ad..b3f9d919a 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -130,7 +130,7 @@ #define STATUS2_TORMENT 0x80000000 // Seems like per-battler statuses. Not quite sure how to categorize these -#define STATUS3_LEECHSEED_BANK 0x3 +#define STATUS3_LEECHSEED_BATTLER 0x3 #define STATUS3_LEECHSEED 0x4 #define STATUS3_ALWAYS_HITS 0x18 // two bits #define STATUS3_PERISH_SONG 0x20 diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h new file mode 100644 index 000000000..4145805c4 --- /dev/null +++ b/include/constants/battle_frontier.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_H +#define GUARD_CONSTANTS_BATTLE_FRONTIER_H + +// Battle Frontier facility ids. +#define FRONTIER_FACILITY_TOWER 0 +#define FRONTIER_FACILITY_DOME 1 +#define FRONTIER_FACILITY_PALACE 2 +#define FRONTIER_FACILITY_ARENA 3 +#define FRONTIER_FACILITY_FACTORY 4 +#define FRONTIER_FACILITY_PIKE 5 +#define FRONTIER_FACILITY_PYRAMID 6 + +#endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index a1a4ed50a..c820a1114 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -37,7 +37,7 @@ #define BS_ATTACKER 1 #define BS_EFFECT_BATTLER 2 #define BS_FAINTED 3 -#define BS_BANK_0 7 +#define BS_BATTLER_0 7 #define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update #define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability #define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability diff --git a/include/constants/moves.h b/include/constants/moves.h index f3a3acb90..85c02e3da 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -357,6 +357,6 @@ #define MOVE_DOOM_DESIRE 353 #define MOVE_PSYCHO_BOOST 354 -#define LAST_MOVE_INDEX MOVE_PSYCHO_BOOST +#define MOVES_COUNT 355 #endif // GUARD_CONSTANTS_MOVES_H diff --git a/include/constants/trainers.h b/include/constants/trainers.h index a017b6975..eb695e4ab 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -857,7 +857,14 @@ #define TRAINER_BRENDAN_16 853 #define TRAINER_MAY_16 854 -#define NO_OF_TRAINERS 854 +#define TRAINERS_COUNT 855 + +// Special Trainer Ids. +#define TRAINER_FRONTIER_BRAIN 1022 +#define TRAINER_SECRET_BASE 1024 +#define TRAINER_LINK_OPPONENT 0x800 +#define TRAINER_OPPONENT_C00 0xC00 +#define TRAINER_STEVEN_PARTNER 0xC03 #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 @@ -953,6 +960,15 @@ #define TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN 91 #define TRAINER_PIC_RUBY_SAPPHIRE_MAY 92 +#define TRAINER_BACK_PIC_BRENDAN 0 +#define TRAINER_BACK_PIC_MAY 1 +#define TRAINER_BACK_PIC_RED 2 +#define TRAINER_BACK_PIC_LEAF 3 +#define TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN 4 +#define TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY 5 +#define TRAINER_BACK_PIC_WALLY 6 +#define TRAINER_BACK_PIC_STEVEN 7 + #define FACILITY_CLASS_HIKER 0x0 #define FACILITY_CLASS_TEAM_AQUA_1 0x1 #define FACILITY_CLASS_PKMN_BREEDER_1 0x2 diff --git a/include/data/battle_moves.h b/include/data/battle_moves.h index 6489fe07f..00a6f7fdb 100644 --- a/include/data/battle_moves.h +++ b/include/data/battle_moves.h @@ -1,7 +1,7 @@ #ifndef GUARD_DATA_BATTLE_MOVES #define GUARD_DATA_BATTLE_MOVES -const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = +const struct BattleMove gBattleMoves[MOVES_COUNT] = { { // MOVE_NONE .effect = EFFECT_HIT, diff --git a/include/data/text/abilities.h b/include/data/text/abilities.h index 2efd76afc..3a1e989d2 100644 --- a/include/data/text/abilities.h +++ b/include/data/text/abilities.h @@ -80,7 +80,7 @@ static const u8 gShellArmorAbilityDescription[] = _("Blocks critical hits."); static const u8 gCacophonyAbilityDescription[] = _("Avoids sound-based moves."); static const u8 gAirLockAbilityDescription[] = _("Negates weather effects."); -const u8 gAbilityNames[][ABILITY_NAME_LENGTH + 1] = +const u8 gAbilityNames[ABILITIES_COUNT][ABILITY_NAME_LENGTH + 1] = { _("-------"), _("STENCH"), @@ -162,7 +162,7 @@ const u8 gAbilityNames[][ABILITY_NAME_LENGTH + 1] = _("AIR LOCK"), }; -const u8 *const gAbilityDescriptionPointers[] = +const u8 *const gAbilityDescriptionPointers[ABILITIES_COUNT] = { gNoneAbilityDescription, gStenchAbilityDescription, diff --git a/include/pokemon.h b/include/pokemon.h index 37028821a..f928243d0 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -556,7 +556,7 @@ void sub_806D544(u16 species, u32 personality, u8 *dest); void DrawSpindaSpots(u16 species, u32 personality, u8 *dest, u8 a4); void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies); bool8 sub_806D7EC(void); -bool16 sub_806D82C(u8 id); +bool16 GetLinkTrainerFlankId(u8 id); s32 GetBattlerMultiplayerId(u16 a1); u8 GetTrainerEncounterMusicId(u16 trainerOpponentId); u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex); diff --git a/include/recorded_battle.h b/include/recorded_battle.h index 8b1fa258d..81c88a15e 100644 --- a/include/recorded_battle.h +++ b/include/recorded_battle.h @@ -16,7 +16,7 @@ void sub_81851A8(u8 *arg0); bool32 CanCopyRecordedBattleSaveData(void); u32 MoveRecordedBattleToSaveData(void); void PlayRecordedBattle(void (*CB2_After)(void)); -u8 sub_8185EA0(void); +u8 GetRecordedBattleFrontierFacility(void); u8 sub_8185EAC(void); void RecordedBattle_SaveParties(void); u8 GetActiveBattlerLinkPlayerGender(void); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 131598985..e82d22576 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -1969,7 +1969,7 @@ static void BattleAICmd_flee(void) static void BattleAICmd_if_random_safari_flee(void) { - u8 safariFleeRate = gBattleStruct->field_7B * 5; // Safari flee rate, from 0-20. + u8 safariFleeRate = gBattleStruct->safariEscapeFactor * 5; // Safari flee rate, from 0-20. if ((u8)(Random() % 100) < safariFleeRate) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index be9609e62..a88c4a076 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -12,6 +12,7 @@ #include "util.h" #include "main.h" #include "constants/songs.h" +#include "constants/trainers.h" #include "sound.h" #include "window.h" #include "m4a.h" @@ -1133,12 +1134,12 @@ static void LinkPartnerHandleDrawTrainerPic(void) if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN) { - trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED; + trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + TRAINER_BACK_PIC_RED; } else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE) { - trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN; + trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN; } else { @@ -1545,12 +1546,12 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void) if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN) { - trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED; + trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + TRAINER_BACK_PIC_RED; } else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE) { - trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN; + trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN; } else { diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index c37423a72..2af17d32e 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -16,6 +16,7 @@ #include "constants/songs.h" #include "sound.h" #include "constants/moves.h" +#include "constants/trainers.h" #include "window.h" #include "m4a.h" #include "palette.h" @@ -39,7 +40,7 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern void sub_806A068(u16, u8); extern void sub_81A57E4(u8 battlerId, u16 stringId); -extern u8 sub_81A4CB0(void); +extern u8 GetFrontierBrainTrainerPicIndex(void); extern u8 sub_81D5588(u16 trainerId); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); extern u8 GetEreaderTrainerFrontSpriteId(void); @@ -1234,7 +1235,7 @@ static void OpponentHandleDrawTrainerPic(void) } else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { - trainerPicId = sub_81A4CB0(); + trainerPicId = GetFrontierBrainTrainerPicIndex(); } else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) { @@ -1318,7 +1319,7 @@ static void OpponentHandleTrainerSlide(void) } else if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { - trainerPicId = sub_81A4CB0(); + trainerPicId = GetFrontierBrainTrainerPicIndex(); } else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) { diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 4b44116dd..1fd1deebf 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -13,6 +13,7 @@ #include "util.h" #include "main.h" #include "constants/songs.h" +#include "constants/trainers.h" #include "sound.h" #include "window.h" #include "m4a.h" diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 4da941ab0..01ad750db 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1082,14 +1082,14 @@ void BtlController_EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 m void BtlController_EmitPrintString(u8 bufferId, u16 stringID) { s32 i; - struct StringInfoBattle* stringInfo; + struct BattleMsgData* stringInfo; sBattleBuffersTransferData[0] = CONTROLLER_PRINTSTRING; sBattleBuffersTransferData[1] = gBattleOutcome; sBattleBuffersTransferData[2] = stringID; sBattleBuffersTransferData[3] = (stringID & 0xFF00) >> 8; - stringInfo = (struct StringInfoBattle*)(&sBattleBuffersTransferData[4]); + stringInfo = (struct BattleMsgData*)(&sBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; stringInfo->originallyUsedMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; @@ -1097,7 +1097,7 @@ void BtlController_EmitPrintString(u8 bufferId, u16 stringID) stringInfo->scrActive = gBattleScripting.battler; stringInfo->unk1605E = gBattleStruct->field_52; stringInfo->hpScale = gBattleStruct->hpScale; - stringInfo->StringBank = gPotentialItemEffectBattler; + stringInfo->itemEffectBattler = gPotentialItemEffectBattler; stringInfo->moveType = gBattleMoves[gCurrentMove].type; for (i = 0; i < MAX_BATTLERS_COUNT; i++) @@ -1108,20 +1108,20 @@ void BtlController_EmitPrintString(u8 bufferId, u16 stringID) stringInfo->textBuffs[1][i] = gBattleTextBuff2[i]; stringInfo->textBuffs[2][i] = gBattleTextBuff3[i]; } - PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct StringInfoBattle) + 4); + PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct BattleMsgData) + 4); } void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringID) { s32 i; - struct StringInfoBattle *stringInfo; + struct BattleMsgData *stringInfo; sBattleBuffersTransferData[0] = CONTROLLER_PRINTSTRINGPLAYERONLY; sBattleBuffersTransferData[1] = CONTROLLER_PRINTSTRINGPLAYERONLY; sBattleBuffersTransferData[2] = stringID; sBattleBuffersTransferData[3] = (stringID & 0xFF00) >> 8; - stringInfo = (struct StringInfoBattle*)(&sBattleBuffersTransferData[4]); + stringInfo = (struct BattleMsgData*)(&sBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; stringInfo->originallyUsedMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; @@ -1137,7 +1137,7 @@ void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringID) stringInfo->textBuffs[1][i] = gBattleTextBuff2[i]; stringInfo->textBuffs[2][i] = gBattleTextBuff3[i]; } - PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct StringInfoBattle) + 4); + PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sizeof(struct BattleMsgData) + 4); } void BtlController_EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2) diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 47af1b9dd..8f17d488e 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -70,45 +70,45 @@ static void Task_ClearBitWhenSpecialAnimDone(u8 taskId); static void ClearSpritesBattlerHealthboxAnimData(void); // const rom data -static const struct CompressedSpriteSheet gUnknown_0832C0D0 = +static const struct CompressedSpriteSheet sSpriteSheet_SinglesPlayerHealthbox = { gUnknown_08C1F1C8, 0x1000, TAG_HEALTHBOX_PLAYER1_TILE }; -static const struct CompressedSpriteSheet gUnknown_0832C0D8 = +static const struct CompressedSpriteSheet sSpriteSheet_SinglesOpponentHealthbox = { gUnknown_08C1F46C, 0x1000, TAG_HEALTHBOX_OPPONENT1_TILE }; -static const struct CompressedSpriteSheet gUnknown_0832C0E0[2] = +static const struct CompressedSpriteSheet sSpriteSheets_DoublesPlayerHealthbox[2] = { {gUnknown_08C1F5E8, 0x800, TAG_HEALTHBOX_PLAYER1_TILE}, {gUnknown_08C1F5E8, 0x800, TAG_HEALTHBOX_PLAYER2_TILE} }; -static const struct CompressedSpriteSheet gUnknown_0832C0F0[2] = +static const struct CompressedSpriteSheet sSpriteSheets_DoublesOpponentHealthbox[2] = { {gUnknown_08C1F76C, 0x800, TAG_HEALTHBOX_OPPONENT1_TILE}, {gUnknown_08C1F76C, 0x800, TAG_HEALTHBOX_OPPONENT2_TILE} }; -static const struct CompressedSpriteSheet gUnknown_0832C100 = +static const struct CompressedSpriteSheet sSpriteSheet_SafariHealthbox = { gUnknown_08C1F8E8, 0x1000, TAG_HEALTHBOX_SAFARI_TILE }; -static const struct CompressedSpriteSheet gUnknown_0832C108[MAX_BATTLERS_COUNT] = +static const struct CompressedSpriteSheet sSpriteSheets_HealthBar[MAX_BATTLERS_COUNT] = { - {gBlankGfxCompressed, 0x0100, 0xd704}, - {gBlankGfxCompressed, 0x0120, 0xd705}, - {gBlankGfxCompressed, 0x0100, 0xd706}, - {gBlankGfxCompressed, 0x0120, 0xd707} + {gBlankGfxCompressed, 0x0100, TAG_HEALTHBAR_PLAYER1_TILE}, + {gBlankGfxCompressed, 0x0120, TAG_HEALTHBAR_OPPONENT1_TILE}, + {gBlankGfxCompressed, 0x0100, TAG_HEALTHBAR_PLAYER2_TILE}, + {gBlankGfxCompressed, 0x0120, TAG_HEALTHBAR_OPPONENT2_TILE} }; -static const struct SpritePalette gUnknown_0832C128[2] = +static const struct SpritePalette sSpritePalettes_HealthBoxHealthBar[2] = { {gBattleInterface_BallStatusBarPal, TAG_HEALTHBOX_PAL}, - {gBattleInterface_BallDisplayPal, 0xd704} + {gBattleInterface_BallDisplayPal, TAG_HEALTHBAR_PAL} }; // code @@ -499,7 +499,7 @@ static void Task_ClearBitWhenSpecialAnimDone(u8 taskId) #undef tBattlerId -// great function to include newly added moves that don't have animation yet +// Great function to include newly added moves that don't have animation yet. bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn) { return FALSE; @@ -679,29 +679,30 @@ void FreeTrainerFrontPicPalette(u16 frontPicId) FreeSpritePaletteByTag(gTrainerFrontPicPaletteTable[frontPicId].tag); } -void sub_805DFFC(void) +// Unused. +void BattleLoadAllHealthBoxesGfxAtOnce(void) { u8 numberOfBattlers = 0; u8 i; - LoadSpritePalette(&gUnknown_0832C128[0]); - LoadSpritePalette(&gUnknown_0832C128[1]); + LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[0]); + LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[1]); if (!IsDoubleBattle()) { - LoadCompressedObjectPic(&gUnknown_0832C0D0); - LoadCompressedObjectPic(&gUnknown_0832C0D8); + LoadCompressedObjectPic(&sSpriteSheet_SinglesPlayerHealthbox); + LoadCompressedObjectPic(&sSpriteSheet_SinglesOpponentHealthbox); numberOfBattlers = 2; } else { - LoadCompressedObjectPic(&gUnknown_0832C0E0[0]); - LoadCompressedObjectPic(&gUnknown_0832C0E0[1]); - LoadCompressedObjectPic(&gUnknown_0832C0F0[0]); - LoadCompressedObjectPic(&gUnknown_0832C0F0[1]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesPlayerHealthbox[0]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesPlayerHealthbox[1]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesOpponentHealthbox[0]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesOpponentHealthbox[1]); numberOfBattlers = 4; } for (i = 0; i < numberOfBattlers; i++) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[i]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[i]]); } bool8 BattleLoadAllHealthBoxesGfx(u8 state) @@ -712,45 +713,45 @@ bool8 BattleLoadAllHealthBoxesGfx(u8 state) { if (state == 1) { - LoadSpritePalette(&gUnknown_0832C128[0]); - LoadSpritePalette(&gUnknown_0832C128[1]); + LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[0]); + LoadSpritePalette(&sSpritePalettes_HealthBoxHealthBar[1]); } else if (!IsDoubleBattle()) { if (state == 2) { if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) - LoadCompressedObjectPic(&gUnknown_0832C100); + LoadCompressedObjectPic(&sSpriteSheet_SafariHealthbox); else - LoadCompressedObjectPic(&gUnknown_0832C0D0); + LoadCompressedObjectPic(&sSpriteSheet_SinglesPlayerHealthbox); } else if (state == 3) - LoadCompressedObjectPic(&gUnknown_0832C0D8); + LoadCompressedObjectPic(&sSpriteSheet_SinglesOpponentHealthbox); else if (state == 4) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[0]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[0]]); else if (state == 5) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[1]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[1]]); else retVal = TRUE; } else { if (state == 2) - LoadCompressedObjectPic(&gUnknown_0832C0E0[0]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesPlayerHealthbox[0]); else if (state == 3) - LoadCompressedObjectPic(&gUnknown_0832C0E0[1]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesPlayerHealthbox[1]); else if (state == 4) - LoadCompressedObjectPic(&gUnknown_0832C0F0[0]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesOpponentHealthbox[0]); else if (state == 5) - LoadCompressedObjectPic(&gUnknown_0832C0F0[1]); + LoadCompressedObjectPic(&sSpriteSheets_DoublesOpponentHealthbox[1]); else if (state == 6) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[0]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[0]]); else if (state == 7) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[1]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[1]]); else if (state == 8) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[2]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[2]]); else if (state == 9) - LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[3]]); + LoadCompressedObjectPic(&sSpriteSheets_HealthBar[gBattlerPositions[3]]); else retVal = TRUE; } diff --git a/src/battle_interface.c b/src/battle_interface.c index 6a30ed487..a6032adc3 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1350,7 +1350,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 } } -// Prints mon's nature and flee rate. Probably used to test pokeblock feeders. +// Prints mon's nature, catch and flee rate. Probably used to test pokeblock-related features. static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon) { u8 text[20]; @@ -1391,8 +1391,8 @@ static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon) } healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; - ConvertIntToDecimalStringN(text + 6, gBattleStruct->field_7C, STR_CONV_MODE_RIGHT_ALIGN, 2); - ConvertIntToDecimalStringN(text + 9, gBattleStruct->field_7B, STR_CONV_MODE_RIGHT_ALIGN, 2); + ConvertIntToDecimalStringN(text + 6, gBattleStruct->safariCatchFactor, STR_CONV_MODE_RIGHT_ALIGN, 2); + ConvertIntToDecimalStringN(text + 9, gBattleStruct->safariEscapeFactor, STR_CONV_MODE_RIGHT_ALIGN, 2); text[5] = CHAR_SPACE; text[8] = CHAR_SLASH; RenderTextFont9(gMonSpritesGfxPtr->barFontGfx, 9, text); diff --git a/src/battle_main.c b/src/battle_main.c index dfe99e003..34558ab38 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -85,7 +85,6 @@ extern u8 gUnknown_0203CF00[]; extern const u16 gBattleTextboxPalette[]; extern const struct BgTemplate gBattleBgTemplates[]; extern const struct WindowTemplate *const gBattleWindowTemplates[]; -extern const u8 gUnknown_0831ACE0[]; extern const u8 *const gBattleScriptsForMoveEffects[]; extern const u8 *const gBattlescriptsForBallThrow[]; extern const u8 *const gBattlescriptsForRunningByItem[]; @@ -308,6 +307,9 @@ u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; // 10 is ×1.0 TYPE_MUL_NORMAL // 05 is ×0.5 TYPE_MUL_NOT_EFFECTIVE // 00 is ×0.0 TYPE_MUL_NO_EFFECT + +static const s8 gUnknown_0831ACE0[] ={-32, -16, -16, -32, -32, 0, 0, 0}; + const u8 gTypeEffectiveness[336] = { TYPE_NORMAL, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE, @@ -561,9 +563,9 @@ const u8 * const gStatusConditionStringsTable[7][2] = {gStatusConditionString_LoveJpn, gText_Love} }; -static const u8 sUnknown_0831BCE0[][3] = {{0, 0, 0}, {3, 5, 0}, {2, 3, 0}, {1, 2, 0}, {1, 1, 0}}; -static const u8 sUnknown_0831BCEF[] = {4, 3, 2, 1}; -static const u8 sUnknown_0831BCF3[] = {4, 4, 4, 4}; +static const u8 sPkblToEscapeFactor[][3] = {{0, 0, 0}, {3, 5, 0}, {2, 3, 0}, {1, 2, 0}, {1, 1, 0}}; +static const u8 sGoNearCounterToCatchFactor[] = {4, 3, 2, 1}; +static const u8 sGoNearCounterToEscapeFactor[] = {4, 4, 4, 4}; // code void CB2_InitBattle(void) @@ -1805,7 +1807,7 @@ static void CB2_HandleStartMultiBattle(void) SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gTrainerBattleOpponent_A = TRAINER_OPPONENT_800; + gTrainerBattleOpponent_A = TRAINER_LINK_OPPONENT; gBattleTypeFlags |= BATTLE_TYPE_20; } } @@ -3051,10 +3053,10 @@ static void BattleStartClearSetData(void) gLeveledUpInBattle = 0; gAbsentBattlerFlags = 0; gBattleStruct->runTries = 0; - gBattleStruct->field_79 = 0; - gBattleStruct->field_7A = 0; - *(&gBattleStruct->field_7C) = gBaseStats[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275; - gBattleStruct->field_7B = 3; + gBattleStruct->safariGoNearCounter = 0; + gBattleStruct->safariPkblThrowCounter = 0; + *(&gBattleStruct->safariCatchFactor) = gBaseStats[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275; + gBattleStruct->safariEscapeFactor = 3; gBattleStruct->wildVictorySong = 0; gBattleStruct->moneyMultiplier = 1; @@ -5746,14 +5748,14 @@ static void HandleAction_ThrowPokeblock(void) if (gBattleResults.pokeblockThrows < 0xFF) gBattleResults.pokeblockThrows++; - if (gBattleStruct->field_7A < 3) - gBattleStruct->field_7A++; - if (gBattleStruct->field_7B > 1) + if (gBattleStruct->safariPkblThrowCounter < 3) + gBattleStruct->safariPkblThrowCounter++; + if (gBattleStruct->safariEscapeFactor > 1) { - if (gBattleStruct->field_7B < sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]]) - gBattleStruct->field_7B = 1; + if (gBattleStruct->safariEscapeFactor < sPkblToEscapeFactor[gBattleStruct->safariPkblThrowCounter][gBattleCommunication[MULTISTRING_CHOOSER]]) + gBattleStruct->safariEscapeFactor = 1; else - gBattleStruct->field_7B -= sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]]; + gBattleStruct->safariEscapeFactor -= sPkblToEscapeFactor[gBattleStruct->safariPkblThrowCounter][gBattleCommunication[MULTISTRING_CHOOSER]]; } gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2]; @@ -5766,22 +5768,22 @@ static void HandleAction_GoNear(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; - gBattleStruct->field_7C += sUnknown_0831BCEF[gBattleStruct->field_79]; - if (gBattleStruct->field_7C > 20) - gBattleStruct->field_7C = 20; + gBattleStruct->safariCatchFactor += sGoNearCounterToCatchFactor[gBattleStruct->safariGoNearCounter]; + if (gBattleStruct->safariCatchFactor > 20) + gBattleStruct->safariCatchFactor = 20; - gBattleStruct->field_7B +=sUnknown_0831BCF3[gBattleStruct->field_79]; - if (gBattleStruct->field_7B > 20) - gBattleStruct->field_7B = 20; + gBattleStruct->safariEscapeFactor += sGoNearCounterToEscapeFactor[gBattleStruct->safariGoNearCounter]; + if (gBattleStruct->safariEscapeFactor > 20) + gBattleStruct->safariEscapeFactor = 20; - if (gBattleStruct->field_79 < 3) + if (gBattleStruct->safariGoNearCounter < 3) { - gBattleStruct->field_79++; + gBattleStruct->safariGoNearCounter++; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } else { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = 1; // Can't get closer. } gBattlescriptCurrInstr = gBattlescriptsForSafariActions[1]; gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT; diff --git a/src/battle_message.c b/src/battle_message.c index d2ac6da8c..7d442ea98 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -6,6 +6,7 @@ #include "text.h" #include "string_util.h" #include "constants/items.h" +#include "constants/trainers.h" #include "event_data.h" #include "link.h" #include "item.h" @@ -2074,7 +2075,7 @@ void BufferStringBattle(u16 stringID) } else { - if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_800 || gBattleTypeFlags & BATTLE_TYPE_x2000000) + if (gTrainerBattleOpponent_A == TRAINER_LINK_OPPONENT || gBattleTypeFlags & BATTLE_TYPE_x2000000) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) stringPtr = sText_LinkTrainer2WithdrewPkmn; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 9c48b083c..bacaf2bac 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3111,7 +3111,7 @@ static void atk1E_jumpifability(void) if (gBattlescriptCurrInstr[1] == BS_ATTACKER_SIDE) { - battlerId = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattlerAttacker, ability, 0, 0); + battlerId = AbilityBattleEffects(ABILITYEFFECT_CHECK_BATTLER_SIDE, gBattlerAttacker, ability, 0, 0); if (battlerId) { gLastUsedAbility = ability; @@ -5033,7 +5033,7 @@ static void atk4F_jumpifcantswitch(void) party = gPlayerParty; i = 0; - if (sub_806D82C(GetBattlerMultiplayerId(gActiveBattler)) == TRUE) + if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gActiveBattler)) == TRUE) i = 3; } else @@ -5054,7 +5054,7 @@ static void atk4F_jumpifcantswitch(void) party = gPlayerParty; i = 0; - if (sub_806D82C(GetBattlerMultiplayerId(gActiveBattler)) == TRUE) + if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gActiveBattler)) == TRUE) i = 3; } @@ -5166,7 +5166,7 @@ static void atk50_openpartyscreen(void) { if (gHitMarker & HITMARKER_FAINTED(gActiveBattler)) { - if (sub_80423F4(gActiveBattler, 6, 6)) + if (HasNoMonsToSwitch(gActiveBattler, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5195,7 +5195,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[0] & hitmarkerFaintBits) { gActiveBattler = 0; - if (sub_80423F4(0, 6, 6)) + if (HasNoMonsToSwitch(0, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5217,7 +5217,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[2] & hitmarkerFaintBits && !(gBitTable[0] & hitmarkerFaintBits)) { gActiveBattler = 2; - if (sub_80423F4(2, 6, 6)) + if (HasNoMonsToSwitch(2, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5238,7 +5238,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[1] & hitmarkerFaintBits) { gActiveBattler = 1; - if (sub_80423F4(1, 6, 6)) + if (HasNoMonsToSwitch(1, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5260,7 +5260,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[3] & hitmarkerFaintBits && !(gBitTable[1] & hitmarkerFaintBits)) { gActiveBattler = 3; - if (sub_80423F4(3, 6, 6)) + if (HasNoMonsToSwitch(3, 6, 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5323,7 +5323,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[2] & hitmarkerFaintBits && gBitTable[0] & hitmarkerFaintBits) { gActiveBattler = 2; - if (sub_80423F4(2, gBattleBufferB[0][1], 6)) + if (HasNoMonsToSwitch(2, gBattleBufferB[0][1], 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5339,7 +5339,7 @@ static void atk50_openpartyscreen(void) if (gBitTable[3] & hitmarkerFaintBits && hitmarkerFaintBits & gBitTable[1]) { gActiveBattler = 3; - if (sub_80423F4(3, gBattleBufferB[1][1], 6)) + if (HasNoMonsToSwitch(3, gBattleBufferB[1][1], 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); @@ -5391,7 +5391,7 @@ static void atk50_openpartyscreen(void) { gBattlescriptCurrInstr += 6; } - else if (sub_80423F4(battlerId, 6, 6)) + else if (HasNoMonsToSwitch(battlerId, 6, 6)) { gActiveBattler = battlerId; gAbsentBattlerFlags |= gBitTable[gActiveBattler]; @@ -7506,7 +7506,7 @@ static void atk8F_forcerandomswitch(void) else if ((gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) || (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_x2000000)) { - if (sub_806D82C(GetBattlerMultiplayerId(gBattlerTarget)) == 1) + if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gBattlerTarget)) == 1) { firstMonId = 3; lastMonId = 6; @@ -9044,7 +9044,7 @@ static void atkBE_rapidspinfree(void) else if (gStatuses3[gBattlerAttacker] & STATUS3_LEECHSEED) { gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED); - gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED_BANK); + gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED_BATTLER); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_LeechSeedFree; } @@ -9760,7 +9760,7 @@ static void atkE1_trygetintimidatetarget(void) { u8 side; - gBattleScripting.battler = gBattleStruct->intimidateBank; + gBattleScripting.battler = gBattleStruct->intimidateBattler; side = GetBattlerSide(gBattleScripting.battler); PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gBattleMons[gBattleScripting.battler].ability) @@ -10115,7 +10115,7 @@ static void atkEF_handleballthrow(void) u8 catchRate; if (gLastUsedItem == ITEM_SAFARI_BALL) - catchRate = gBattleStruct->field_7C * 1275 / 100; + catchRate = gBattleStruct->safariCatchFactor * 1275 / 100; else catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate; diff --git a/src/battle_tv.c b/src/battle_tv.c index cd0490a1b..6f9ee414e 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -796,8 +796,8 @@ void TryPutLinkBattleTvShowOnAir(void) if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - if ((playerBestMonId < 3 && !sub_806D82C(gBattleScripting.multiplayerId)) - || (playerBestMonId >= 3 && sub_806D82C(gBattleScripting.multiplayerId))) + if ((playerBestMonId < 3 && !GetLinkTrainerFlankId(gBattleScripting.multiplayerId)) + || (playerBestMonId >= 3 && GetLinkTrainerFlankId(gBattleScripting.multiplayerId))) { j = (opponentBestMonId < 3) ? 0 : 1; PutBattleUpdateOnTheAir(sub_806EF84(j, gBattleScripting.multiplayerId), moveId, playerBestSpecies, opponentBestSpecies); @@ -1078,7 +1078,7 @@ _0817E5C8:\n\ ldr r0, =gBattleScripting\n\ adds r0, 0x25\n\ ldrb r0, [r0]\n\ - bl sub_806D82C\n\ + bl GetLinkTrainerFlankId\n\ lsls r0, 16\n\ cmp r0, 0\n\ beq _0817E630\n\ @@ -1088,7 +1088,7 @@ _0817E620:\n\ ldr r0, =gBattleScripting\n\ adds r0, 0x25\n\ ldrb r0, [r0]\n\ - bl sub_806D82C\n\ + bl GetLinkTrainerFlankId\n\ lsls r0, 16\n\ cmp r0, 0\n\ beq _0817E670\n\ diff --git a/src/battle_util.c b/src/battle_util.c index b9a7f546a..5d2ec62a9 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -46,7 +46,7 @@ u8 GetBattlerForBattleScript(u8 caseId) case BS_EFFECT_BATTLER: ret = gEffectBattler; break; - case BS_BANK_0: + case BS_BATTLER_0: ret = 0; break; case BS_SCRIPTING: @@ -292,7 +292,7 @@ void sub_803FA70(u8 battler) } } -void BattleScriptPush(const u8* bsPtr) +void BattleScriptPush(const u8 *bsPtr) { gBattleResources->battleScriptsStack->ptr[gBattleResources->battleScriptsStack->size++] = bsPtr; } @@ -453,7 +453,7 @@ bool8 AreAllMovesUnusable(void) u8 unusable; unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF); - if (unusable == 0xF) // all moves are unusable + if (unusable == 0xF) // All moves are unusable. { gProtectStructs[gActiveBattler].onlyStruggle = 1; gSelectionBattleScripts[gActiveBattler] = BattleScript_NoMovesLeft; @@ -470,11 +470,11 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move) { s32 i; u8 imprisionedMoves = 0; - u8 bankSide = GetBattlerSide(battlerId); + u8 BattlerSide = GetBattlerSide(battlerId); for (i = 0; i < gBattlersCount; i++) { - if (bankSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS) + if (BattlerSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS) { s32 j; for (j = 0; j < 4; j++) @@ -504,7 +504,7 @@ u8 UpdateTurnCounters(void) do { - u8 sideBank; + u8 side; switch (gBattleStruct->turnCountersTracker) { @@ -533,13 +533,13 @@ u8 UpdateTurnCounters(void) case 1: while (gBattleStruct->turnSideTracker < 2) { - sideBank = gBattleStruct->turnSideTracker; - gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].reflectBattlerId; - if (gSideStatuses[sideBank] & SIDE_STATUS_REFLECT) + side = gBattleStruct->turnSideTracker; + gActiveBattler = gBattlerAttacker = gSideTimers[side].reflectBattlerId; + if (gSideStatuses[side] & SIDE_STATUS_REFLECT) { - if (--gSideTimers[sideBank].reflectTimer == 0) + if (--gSideTimers[side].reflectTimer == 0) { - gSideStatuses[sideBank] &= ~SIDE_STATUS_REFLECT; + gSideStatuses[side] &= ~SIDE_STATUS_REFLECT; BattleScriptExecute(BattleScript_SideStatusWoreOff); PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_REFLECT); effect++; @@ -558,15 +558,15 @@ u8 UpdateTurnCounters(void) case 2: while (gBattleStruct->turnSideTracker < 2) { - sideBank = gBattleStruct->turnSideTracker; - gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].lightscreenBattlerId; - if (gSideStatuses[sideBank] & SIDE_STATUS_LIGHTSCREEN) + side = gBattleStruct->turnSideTracker; + gActiveBattler = gBattlerAttacker = gSideTimers[side].lightscreenBattlerId; + if (gSideStatuses[side] & SIDE_STATUS_LIGHTSCREEN) { - if (--gSideTimers[sideBank].lightscreenTimer == 0) + if (--gSideTimers[side].lightscreenTimer == 0) { - gSideStatuses[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN; + gSideStatuses[side] &= ~SIDE_STATUS_LIGHTSCREEN; BattleScriptExecute(BattleScript_SideStatusWoreOff); - gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; + gBattleCommunication[MULTISTRING_CHOOSER] = side; PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_LIGHT_SCREEN); effect++; } @@ -584,14 +584,14 @@ u8 UpdateTurnCounters(void) case 3: while (gBattleStruct->turnSideTracker < 2) { - sideBank = gBattleStruct->turnSideTracker; - gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].mistBattlerId; - if (gSideTimers[sideBank].mistTimer != 0 - && --gSideTimers[sideBank].mistTimer == 0) + side = gBattleStruct->turnSideTracker; + gActiveBattler = gBattlerAttacker = gSideTimers[side].mistBattlerId; + if (gSideTimers[side].mistTimer != 0 + && --gSideTimers[side].mistTimer == 0) { - gSideStatuses[sideBank] &= ~SIDE_STATUS_MIST; + gSideStatuses[side] &= ~SIDE_STATUS_MIST; BattleScriptExecute(BattleScript_SideStatusWoreOff); - gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; + gBattleCommunication[MULTISTRING_CHOOSER] = side; PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_MIST); effect++; } @@ -608,13 +608,13 @@ u8 UpdateTurnCounters(void) case 4: while (gBattleStruct->turnSideTracker < 2) { - sideBank = gBattleStruct->turnSideTracker; - gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].safeguardBattlerId; - if (gSideStatuses[sideBank] & SIDE_STATUS_SAFEGUARD) + side = gBattleStruct->turnSideTracker; + gActiveBattler = gBattlerAttacker = gSideTimers[side].safeguardBattlerId; + if (gSideStatuses[side] & SIDE_STATUS_SAFEGUARD) { - if (--gSideTimers[sideBank].safeguardTimer == 0) + if (--gSideTimers[side].safeguardTimer == 0) { - gSideStatuses[sideBank] &= ~SIDE_STATUS_SAFEGUARD; + gSideStatuses[side] &= ~SIDE_STATUS_SAFEGUARD; BattleScriptExecute(BattleScript_SafeguardEnds); effect++; } @@ -795,10 +795,10 @@ u8 TurnBasedEffects(void) break; case 3: // leech seed if ((gStatuses3[gActiveBattler] & STATUS3_LEECHSEED) - && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK].hp != 0 + && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER].hp != 0 && gBattleMons[gActiveBattler].hp != 0) { - gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the battlerId that receives HP + gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER; // Notice gBattlerTarget is actually the HP receiver. gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; @@ -848,8 +848,8 @@ u8 TurnBasedEffects(void) case 7: // spooky nightmares if ((gBattleMons[gActiveBattler].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBattler].hp != 0) { - // R/S does not perform this sleep check, which causes the nighmare effect to - // persist even after the affected Pokemon has been awakened by Shed Skin + // R/S does not perform this sleep check, which causes the nightmare effect to + // persist even after the affected Pokemon has been awakened by Shed Skin. if (gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP) { gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4; @@ -983,7 +983,7 @@ u8 TurnBasedEffects(void) case 12: // disable if (gDisableStructs[gActiveBattler].disableTimer1 != 0) { - int i; + s32 i; for (i = 0; i < 4; i++) { if (gDisableStructs[gActiveBattler].disabledMove == gBattleMons[gActiveBattler].moves[i]) @@ -1184,7 +1184,7 @@ bool8 HandleFaintedMonActions(void) return FALSE; do { - int i; + s32 i; switch (gBattleStruct->faintedActionsState) { case 0: @@ -1192,7 +1192,7 @@ bool8 HandleFaintedMonActions(void) gBattleStruct->faintedActionsState++; for (i = 0; i < gBattlersCount; i++) { - if (gAbsentBattlerFlags & gBitTable[i] && !sub_80423F4(i, 6, 6)) + if (gAbsentBattlerFlags & gBitTable[i] && !HasNoMonsToSwitch(i, 6, 6)) gAbsentBattlerFlags &= ~(gBitTable[i]); } // fall through @@ -1256,7 +1256,7 @@ bool8 HandleFaintedMonActions(void) void TryClearRageStatuses(void) { - int i; + s32 i; for (i = 0; i < gBattlersCount; i++) { if ((gBattleMons[i].status2 & STATUS2_RAGE) && gChosenMoveByBattler[i] != MOVE_RAGE) @@ -1467,7 +1467,9 @@ u8 AtkCanceller_UnableToUseMove(void) { gBattleScripting.battler = CountTrailingZeroBits((gBattleMons[gBattlerAttacker].status2 & STATUS2_INFATUATION) >> 0x10); if (Random() & 1) + { BattleScriptPushCursor(); + } else { BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack); @@ -1485,7 +1487,9 @@ u8 AtkCanceller_UnableToUseMove(void) { gBattleMons[gBattlerAttacker].status2 -= 0x100; if (gBattleMons[gBattlerAttacker].status2 & STATUS2_BIDE) + { gBattlescriptCurrInstr = BattleScript_BideStoringEnergy; + } else { // This is removed in Emerald for some reason @@ -1500,7 +1504,9 @@ u8 AtkCanceller_UnableToUseMove(void) gBattlescriptCurrInstr = BattleScript_BideAttack; } else + { gBattlescriptCurrInstr = BattleScript_BideNoEnergyToAttack; + } } effect = 1; } @@ -1535,29 +1541,31 @@ u8 AtkCanceller_UnableToUseMove(void) return effect; } -bool8 sub_80423F4(u8 battler, u8 r1, u8 r2) +bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2) { - struct Pokemon* party; - u8 r7; - u8 r6; + struct Pokemon *party; + u8 id1, id2; s32 i; + if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) return FALSE; + if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { if (GetBattlerSide(battler) == B_SIDE_PLAYER) party = gPlayerParty; else party = gEnemyParty; - r6 = ((battler & 2) / 2); - for (i = r6 * 3; i < r6 * 3 + 3; i++) + + id1 = ((battler & BIT_FLANK) / 2); + for (i = id1 * 3; i < id1 * 3 + 3; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 - && GetMonData(&party[i], MON_DATA_SPECIES2) != 0 + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) break; } - return (i == r6 * 3 + 3); + return (i == id1 * 3 + 3); } else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -1566,86 +1574,95 @@ bool8 sub_80423F4(u8 battler, u8 r1, u8 r2) if (GetBattlerSide(battler) == B_SIDE_PLAYER) { party = gPlayerParty; - r7 = GetBattlerMultiplayerId(battler); - r6 = sub_806D82C(r7); + id2 = GetBattlerMultiplayerId(battler); + id1 = GetLinkTrainerFlankId(id2); } else { - // FIXME: Compiler insists on moving r4 into r1 before doing the eor + // FIXME: Compiler insists on moving r4 into r1 before doing the eor. #ifndef NONMATCHING - register u32 var asm("r1"); + register u32 var asm("r1"); #else - u32 var; + u32 var; #endif // NONMATCHING party = gEnemyParty; - var = battler ^ 1; - r6 = (var != 0) ? 1 : 0; + var = battler ^ BIT_SIDE; + if (var == 0) + id1 = 0; + else + id1 = 1; } } else { - r7 = GetBattlerMultiplayerId(battler); + id2 = GetBattlerMultiplayerId(battler); + if (GetBattlerSide(battler) == B_SIDE_PLAYER) party = gPlayerParty; else party = gEnemyParty; - r6 = sub_806D82C(r7); + + id1 = GetLinkTrainerFlankId(id2); } - for (i = r6 * 3; i < r6 * 3 + 3; i++) + + for (i = id1 * 3; i < id1 * 3 + 3; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 - && GetMonData(&party[i], MON_DATA_SPECIES2) != 0 + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) break; } - return (i == r6 * 3 + 3); + return (i == id1 * 3 + 3); } else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && GetBattlerSide(battler) == B_SIDE_OPPONENT) { party = gEnemyParty; if (battler == 1) - r6 = 0; + id1 = 0; else - r6 = 3; - for (i = r6; i < r6 + 3; i++) + id1 = 3; + + for (i = id1; i < id1 + 3; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 - && GetMonData(&party[i], MON_DATA_SPECIES2) != 0 + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) break; } - return (i == r6 + 3); + return (i == id1 + 3); } else { if (GetBattlerSide(battler) == B_SIDE_OPPONENT) { - r7 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); - r6 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); + id2 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + id1 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); party = gEnemyParty; } else { - r7 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); - r6 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); + id2 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + id1 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); party = gPlayerParty; } - if (r1 == 6) - r1 = gBattlerPartyIndexes[r7]; - if (r2 == 6) - r2 = gBattlerPartyIndexes[r6]; - for (i = 0; i < 6; i++) + + if (partyIdBattlerOn1 == PARTY_SIZE) + partyIdBattlerOn1 = gBattlerPartyIndexes[id2]; + if (partyIdBattlerOn2 == PARTY_SIZE) + partyIdBattlerOn2 = gBattlerPartyIndexes[id1]; + + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 - && GetMonData(&party[i], MON_DATA_SPECIES2) != 0 + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG - // FIXME: Using index[array] instead of array[index] is BAD! - && i != r1 && i != r2 && i != r7[gBattleStruct->monToSwitchIntoId] && i != r6[gBattleStruct->monToSwitchIntoId]) + && i != partyIdBattlerOn1 && i != partyIdBattlerOn2 + && i != *(gBattleStruct->monToSwitchIntoId + id2) && i != id1[gBattleStruct->monToSwitchIntoId]) break; } - return (i == 6); + return (i == PARTY_SIZE); } } @@ -1706,6 +1723,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA if (gBattlerAttacker >= gBattlersCount) gBattlerAttacker = battler; + if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) pokeAtk = &gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]; else @@ -1713,6 +1731,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA if (gBattlerTarget >= gBattlersCount) gBattlerTarget = battler; + if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) pokeDef = &gPlayerParty[gBattlerPartyIndexes[gBattlerTarget]]; else @@ -1724,7 +1743,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA speciesDef = GetMonData(pokeDef, MON_DATA_SPECIES); pidDef = GetMonData(pokeDef, MON_DATA_PERSONALITY); - if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) // why isn't that check done at the beginning? + if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) // Why isn't that check done at the beginning? { u8 moveType; s32 i; @@ -2271,7 +2290,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA gLastUsedAbility = ABILITY_INTIMIDATE; gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); BattleScriptPushCursorAndCallback(BattleScript_82DB4B8); - gBattleStruct->intimidateBank = i; + gBattleStruct->intimidateBattler = i; effect++; break; } @@ -2343,7 +2362,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_82DB4C1; - gBattleStruct->intimidateBank = i; + gBattleStruct->intimidateBattler = i; effect++; break; } @@ -2360,7 +2379,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } } break; - case ABILITYEFFECT_CHECK_BANK_SIDE: // 13 + case ABILITYEFFECT_CHECK_BATTLER_SIDE: // 13 side = GetBattlerSide(battler); for (i = 0; i < gBattlersCount; i++) { @@ -2410,7 +2429,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } } break; - case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK: // 15 + case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER: // 15 for (i = 0; i < gBattlersCount; i++) { if (gBattleMons[i].ability == ability && i != battler) @@ -2431,7 +2450,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } } break; - case ABILITYEFFECT_COUNT_BANK_SIDE: // 17 + case ABILITYEFFECT_COUNT_BATTLER_SIDE: // 17 side = GetBattlerSide(battler); for (i = 0; i < gBattlersCount; i++) { @@ -2492,20 +2511,20 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) int i = 0; u8 effect = ITEM_NO_EFFECT; u8 changedPP = 0; - u8 bankHoldEffect, atkHoldEffect, defHoldEffect; - u8 bankQuality, atkQuality, defQuality; + u8 BattlerHoldEffect, atkHoldEffect, defHoldEffect; + u8 BattlerQuality, atkQuality, defQuality; u16 atkItem, defItem; gLastUsedItem = gBattleMons[battlerId].item; if (gLastUsedItem == ITEM_ENIGMA_BERRY) { - bankHoldEffect = gEnigmaBerries[battlerId].holdEffect; - bankQuality = gEnigmaBerries[battlerId].holdEffectParam; + BattlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; + BattlerQuality = gEnigmaBerries[battlerId].holdEffectParam; } else { - bankHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + BattlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + BattlerQuality = ItemId_GetHoldEffectParam(gLastUsedItem); } atkItem = gBattleMons[gBattlerAttacker].item; @@ -2536,7 +2555,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) switch (caseID) { case ITEMEFFECT_ON_SWITCH_IN: - switch (bankHoldEffect) + switch (BattlerHoldEffect) { case HOLD_EFFECT_DOUBLE_PRIZE: if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) @@ -2564,13 +2583,13 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case 1: if (gBattleMons[battlerId].hp) { - switch (bankHoldEffect) + switch (BattlerHoldEffect) { case HOLD_EFFECT_RESTORE_HP: if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn) { - gBattleMoveDamage = bankQuality; - if (gBattleMons[battlerId].hp + bankQuality > gBattleMons[battlerId].maxHP) + gBattleMoveDamage = BattlerQuality; + if (gBattleMons[battlerId].hp + BattlerQuality > gBattleMons[battlerId].maxHP) gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp; gBattleMoveDamage *= -1; BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); @@ -2599,10 +2618,10 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) if (i != 4) { u8 maxPP = CalculatePPWithBonus(move, ppBonuses, i); - if (changedPP + bankQuality > maxPP) + if (changedPP + BattlerQuality > maxPP) changedPP = maxPP; else - changedPP = changedPP + bankQuality; + changedPP = changedPP + BattlerQuality; PREPARE_MOVE_BUFFER(gBattleTextBuff1, move); @@ -2641,7 +2660,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gBattleMoveDamage *= -1; BattleScriptExecute(BattleScript_ItemHealHP_End2); effect = ITEM_HP_CHANGE; - RecordItemEffectBattle(battlerId, bankHoldEffect); + RecordItemEffectBattle(battlerId, BattlerHoldEffect); } break; // nice copy/paste there gamefreak, making a function for confuse berries was too much eh? @@ -2650,7 +2669,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SPICY); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2668,7 +2687,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_DRY); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2686,7 +2705,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SWEET); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2704,7 +2723,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_BITTER); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2722,7 +2741,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SOUR); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2737,7 +2756,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) break; // copy/paste again, smh case HOLD_EFFECT_ATTACK_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK); PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE); @@ -2751,7 +2770,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_DEFENSE_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_DEF); @@ -2764,7 +2783,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SPEED_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPEED); @@ -2777,7 +2796,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SP_ATTACK_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPATK); @@ -2790,7 +2809,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SP_DEFENSE_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPDEF); @@ -2803,7 +2822,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_CRITICAL_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY)) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY)) { gBattleMons[battlerId].status2 |= STATUS2_FOCUS_ENERGY; BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2); @@ -2811,7 +2830,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_RANDOM_STAT_UP: - if (!moveTurn && gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality) + if (!moveTurn && gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality) { for (i = 0; i < 5; i++) { @@ -2977,15 +2996,15 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gLastUsedItem = gBattleMons[battlerId].item; if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY) { - bankHoldEffect = gEnigmaBerries[battlerId].holdEffect; - bankQuality = gEnigmaBerries[battlerId].holdEffectParam; + BattlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; + BattlerQuality = gEnigmaBerries[battlerId].holdEffectParam; } else { - bankHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + BattlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + BattlerQuality = ItemId_GetHoldEffectParam(gLastUsedItem); } - switch (bankHoldEffect) + switch (BattlerHoldEffect) { case HOLD_EFFECT_CURE_PAR: if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS) @@ -3180,7 +3199,7 @@ void HandleAction_RunBattleScript(void) // identical to RunBattleScriptCommands u8 GetMoveTarget(u16 move, u8 setTarget) { - u8 targetBank = 0; + u8 targetBattler = 0; u8 moveTarget; u8 side; @@ -3194,21 +3213,21 @@ u8 GetMoveTarget(u16 move, u8 setTarget) case MOVE_TARGET_SELECTED: side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE; if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) - targetBank = gSideTimers[side].followmeTarget; + targetBattler = gSideTimers[side].followmeTarget; else { side = GetBattlerSide(gBattlerAttacker); do { - targetBank = Random() % gBattlersCount; - } while (targetBank == gBattlerAttacker || side == GetBattlerSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]); + targetBattler = Random() % gBattlersCount; + } while (targetBattler == gBattlerAttacker || side == GetBattlerSide(targetBattler) || gAbsentBattlerFlags & gBitTable[targetBattler]); if (gBattleMoves[move].type == TYPE_ELECTRIC && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattlerAttacker, ABILITY_LIGHTNING_ROD, 0, 0) - && gBattleMons[targetBank].ability != ABILITY_LIGHTNING_ROD) + && gBattleMons[targetBattler].ability != ABILITY_LIGHTNING_ROD) { - targetBank ^= BIT_FLANK; - RecordAbilityBattle(targetBank, gBattleMons[targetBank].ability); - gSpecialStatuses[targetBank].lightningRodRedirected = 1; + targetBattler ^= BIT_FLANK; + RecordAbilityBattle(targetBattler, gBattleMons[targetBattler].ability); + gSpecialStatuses[targetBattler].lightningRodRedirected = 1; } } break; @@ -3216,45 +3235,45 @@ u8 GetMoveTarget(u16 move, u8 setTarget) case MOVE_TARGET_BOTH: case MOVE_TARGET_FOES_AND_ALLY: case MOVE_TARGET_OPPONENTS_FIELD: - targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); - if (gAbsentBattlerFlags & gBitTable[targetBank]) - targetBank ^= BIT_FLANK; + targetBattler = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); + if (gAbsentBattlerFlags & gBitTable[targetBattler]) + targetBattler ^= BIT_FLANK; break; case MOVE_TARGET_RANDOM: side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE; if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) - targetBank = gSideTimers[side].followmeTarget; + targetBattler = gSideTimers[side].followmeTarget; else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & MOVE_TARGET_RANDOM) { if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) { if (Random() & 1) - targetBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + targetBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); else - targetBank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); + targetBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); } else { if (Random() & 1) - targetBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + targetBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); else - targetBank = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); + targetBattler = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); } - if (gAbsentBattlerFlags & gBitTable[targetBank]) - targetBank ^= BIT_FLANK; + if (gAbsentBattlerFlags & gBitTable[targetBattler]) + targetBattler ^= BIT_FLANK; } else - targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); + targetBattler = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); break; case MOVE_TARGET_USER_OR_SELECTED: case MOVE_TARGET_USER: - targetBank = gBattlerAttacker; + targetBattler = gBattlerAttacker; break; } - *(gBattleStruct->moveTarget + gBattlerAttacker) = targetBank; + *(gBattleStruct->moveTarget + gBattlerAttacker) = targetBattler; - return targetBank; + return targetBattler; } static bool32 HasObedientBitSet(u8 battlerId) diff --git a/src/pokemon.c b/src/pokemon.c index a4d62feca..7d685062f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1964,11 +1964,11 @@ void CalculateMonStats(struct Pokemon *mon) SetMonData(mon, MON_DATA_MAX_HP, &newMaxHP); - CALC_STAT(baseAttack, attackIV, attackEV, 1, MON_DATA_ATK) - CALC_STAT(baseDefense, defenseIV, defenseEV, 2, MON_DATA_DEF) - CALC_STAT(baseSpeed, speedIV, speedEV, 3, MON_DATA_SPEED) - CALC_STAT(baseSpAttack, spAttackIV, spAttackEV, 4, MON_DATA_SPATK) - CALC_STAT(baseSpDefense, spDefenseIV, spDefenseEV, 5, MON_DATA_SPDEF) + CALC_STAT(baseAttack, attackIV, attackEV, STAT_ATK, MON_DATA_ATK) + CALC_STAT(baseDefense, defenseIV, defenseEV, STAT_DEF, MON_DATA_DEF) + CALC_STAT(baseSpeed, speedIV, speedEV, STAT_SPEED, MON_DATA_SPEED) + CALC_STAT(baseSpAttack, spAttackIV, spAttackEV, STAT_SPATK, MON_DATA_SPATK) + CALC_STAT(baseSpDefense, spDefenseIV, spDefenseEV, STAT_SPDEF, MON_DATA_SPDEF) if (species == SPECIES_SHEDINJA) { @@ -4819,21 +4819,21 @@ bool8 sub_806D7EC(void) return retVal; } -bool16 sub_806D82C(u8 id) +u16 GetLinkTrainerFlankId(u8 linkPlayerId) { - bool16 retVal = FALSE; - switch (gLinkPlayers[id].lp_field_18) + u16 flankId = 0; + switch (gLinkPlayers[linkPlayerId].lp_field_18) { case 0: case 3: - retVal = FALSE; + flankId = 0; break; case 1: case 2: - retVal = TRUE; + flankId = 1; break; } - return retVal; + return flankId; } s32 GetBattlerMultiplayerId(u16 a1) diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 3a4265895..e36716feb 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -58,8 +58,8 @@ struct RecordedBattleSave u8 field_4FC; u8 field_4FD; u8 field_4FE; - u8 battleStyle : 1; - u8 textSpeed : 3; + u8 battleStyle:1; + u8 textSpeed:3; u32 AI_scripts; u8 field_504[8]; u8 field_50C; @@ -79,19 +79,19 @@ EWRAM_DATA static u16 sUnknown_0203C79C[4] = {0}; EWRAM_DATA static u16 sUnknown_0203C7A4[4] = {0}; EWRAM_DATA static u8 sUnknown_0203C7AC = 0; EWRAM_DATA static u8 sUnknown_0203C7AD = 0; -EWRAM_DATA static u8 sRecordedBattle_FrontierFacility = 0; +EWRAM_DATA static u8 sFrontierFacility = 0; EWRAM_DATA static u8 sUnknown_0203C7AF = 0; EWRAM_DATA static MainCallback sCallback2_AfterRecordedBattle = NULL; EWRAM_DATA u8 gUnknown_0203C7B4 = 0; EWRAM_DATA static u8 sUnknown_0203C7B5 = 0; -EWRAM_DATA static u8 sRecordedBattle_BattleStyle = 0; -EWRAM_DATA static u8 sRecordedBattle_TextSpeed = 0; -EWRAM_DATA static u32 sRecordedBattle_BattleFlags = 0; -EWRAM_DATA static u32 sRecordedBattle_AI_Scripts = 0; +EWRAM_DATA static u8 sBattleStyle = 0; +EWRAM_DATA static u8 sTextSpeed = 0; +EWRAM_DATA static u32 sBattleFlags = 0; +EWRAM_DATA static u32 sAI_Scripts = 0; EWRAM_DATA static struct Pokemon sSavedPlayerParty[PARTY_SIZE] = {0}; EWRAM_DATA static struct Pokemon sSavedOpponentParty[PARTY_SIZE] = {0}; -EWRAM_DATA static u16 sRecordedBattle_PlayerMonMoves[2][4] = {0}; -EWRAM_DATA static struct PlayerInfo sRecordedBattle_Players[MAX_BATTLERS_COUNT] = {0}; +EWRAM_DATA static u16 sPlayerMonMoves[2][4] = {0}; +EWRAM_DATA static struct PlayerInfo sPlayers[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA static u8 sUnknown_0203CCD0 = 0; EWRAM_DATA static u8 sUnknown_0203CCD1[8] = {0}; EWRAM_DATA static u8 sUnknown_0203CCD9 = 0; @@ -126,8 +126,8 @@ void sub_8184DA4(u8 arg0) { sBattleRecords[i][j] |= 0xFF; } - sRecordedBattle_BattleFlags = gBattleTypeFlags; - sRecordedBattle_AI_Scripts = gBattleResources->ai->aiFlags; + sBattleFlags = gBattleTypeFlags; + sAI_Scripts = gBattleResources->ai->aiFlags; } } } @@ -139,7 +139,7 @@ void sub_8184E58(void) if (sUnknown_0203C7AC == 1) { gRecordedBattleRngSeed = gRngValue; - sRecordedBattle_FrontierFacility = VarGet(VAR_FRONTIER_FACILITY); + sFrontierFacility = VarGet(VAR_FRONTIER_FACILITY); sUnknown_0203C7AF = sub_81A513C(); } else if (sUnknown_0203C7AC == 2) @@ -157,37 +157,37 @@ void sub_8184E58(void) for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - sRecordedBattle_Players[i].trainerId = gLinkPlayers[i].trainerId; - sRecordedBattle_Players[i].gender = gLinkPlayers[i].gender; - sRecordedBattle_Players[i].battlerId = gLinkPlayers[i].lp_field_18; - sRecordedBattle_Players[i].language = gLinkPlayers[i].language; + sPlayers[i].trainerId = gLinkPlayers[i].trainerId; + sPlayers[i].gender = gLinkPlayers[i].gender; + sPlayers[i].battlerId = gLinkPlayers[i].lp_field_18; + sPlayers[i].language = gLinkPlayers[i].language; if (i < linkPlayersCount) { StringCopy(text, gLinkPlayers[i].name); StripExtCtrlCodes(text); - StringCopy(sRecordedBattle_Players[i].name, text); + StringCopy(sPlayers[i].name, text); } else { for (j = 0; j < PLAYER_NAME_LENGTH; j++) - sRecordedBattle_Players[i].name[j] = gLinkPlayers[i].name[j]; + sPlayers[i].name[j] = gLinkPlayers[i].name[j]; } } } else { - sRecordedBattle_Players[0].trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) + sPlayers[0].trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8) | (gSaveBlock2Ptr->playerTrainerId[2] << 16) | (gSaveBlock2Ptr->playerTrainerId[3] << 24); - sRecordedBattle_Players[0].gender = gSaveBlock2Ptr->playerGender; - sRecordedBattle_Players[0].battlerId = 0; - sRecordedBattle_Players[0].language = gGameLanguage; + sPlayers[0].gender = gSaveBlock2Ptr->playerGender; + sPlayers[0].battlerId = 0; + sPlayers[0].language = gGameLanguage; for (i = 0; i < PLAYER_NAME_LENGTH; i++) - sRecordedBattle_Players[0].name[i] = gSaveBlock2Ptr->playerName[i]; + sPlayers[0].name[i] = gSaveBlock2Ptr->playerName[i]; } } @@ -214,7 +214,7 @@ void RecordedBattle_ClearBattlerAction(u8 battlerId, u8 bytesToClear) u8 RecordedBattle_GetBattlerAction(u8 battlerId) { - // trying to read past array or invalid action byte, battle is over + // Trying to read past array or invalid action byte, battle is over. if (sRecordedBytesNo[battlerId] >= BATTLER_RECORD_SIZE || sBattleRecords[battlerId][sRecordedBytesNo[battlerId]] == 0xFF) { gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah @@ -345,37 +345,37 @@ u32 MoveRecordedBattleToSaveData(void) { for (j = 0; j < PLAYER_NAME_LENGTH; j++) { - battleSave->playersName[i][j] = sRecordedBattle_Players[i].name[j]; + battleSave->playersName[i][j] = sPlayers[i].name[j]; } - battleSave->playersGender[i] = sRecordedBattle_Players[i].gender; - battleSave->playersLanguage[i] = sRecordedBattle_Players[i].language; - battleSave->playersBattlers[i] = sRecordedBattle_Players[i].battlerId; - battleSave->playersTrainerId[i] = sRecordedBattle_Players[i].trainerId; + battleSave->playersGender[i] = sPlayers[i].gender; + battleSave->playersLanguage[i] = sPlayers[i].language; + battleSave->playersBattlers[i] = sPlayers[i].battlerId; + battleSave->playersTrainerId[i] = sPlayers[i].trainerId; } battleSave->rngSeed = gRecordedBattleRngSeed; - if (sRecordedBattle_BattleFlags & BATTLE_TYPE_LINK) + if (sBattleFlags & BATTLE_TYPE_LINK) { - battleSave->battleFlags = (sRecordedBattle_BattleFlags & ~(BATTLE_TYPE_LINK | BATTLE_TYPE_20)); + battleSave->battleFlags = (sBattleFlags & ~(BATTLE_TYPE_LINK | BATTLE_TYPE_20)); battleSave->battleFlags |= BATTLE_TYPE_x2000000; - if (sRecordedBattle_BattleFlags & BATTLE_TYPE_WILD) + if (sBattleFlags & BATTLE_TYPE_WILD) { battleSave->battleFlags |= BATTLE_TYPE_x80000000; } - else if (sRecordedBattle_BattleFlags & BATTLE_TYPE_MULTI) + else if (sBattleFlags & BATTLE_TYPE_MULTI) { - switch (sRecordedBattle_Players[0].battlerId) + switch (sPlayers[0].battlerId) { case 0: case 2: - if (!(sRecordedBattle_Players[gUnknown_0203C7B4].battlerId & 1)) + if (!(sPlayers[gUnknown_0203C7B4].battlerId & 1)) battleSave->battleFlags |= BATTLE_TYPE_x80000000; break; case 1: case 3: - if ((sRecordedBattle_Players[gUnknown_0203C7B4].battlerId & 1)) + if ((sPlayers[gUnknown_0203C7B4].battlerId & 1)) battleSave->battleFlags |= BATTLE_TYPE_x80000000; break; } @@ -383,7 +383,7 @@ u32 MoveRecordedBattleToSaveData(void) } else { - battleSave->battleFlags = sRecordedBattle_BattleFlags; + battleSave->battleFlags = sBattleFlags; } battleSave->opponentA = gTrainerBattleOpponent_A; @@ -391,11 +391,11 @@ u32 MoveRecordedBattleToSaveData(void) battleSave->partnerId = gPartnerTrainerId; battleSave->field_4FA = gUnknown_0203C7B4; battleSave->field_4FC = gSaveBlock2Ptr->field_CA9_b; - battleSave->field_4FD = sRecordedBattle_FrontierFacility; + battleSave->field_4FD = sFrontierFacility; battleSave->field_4FE = sUnknown_0203C7AF; battleSave->battleStyle = gSaveBlock2Ptr->optionsBattleStyle; battleSave->textSpeed = gSaveBlock2Ptr->optionsTextSpeed; - battleSave->AI_scripts = sRecordedBattle_AI_Scripts; + battleSave->AI_scripts = sAI_Scripts; /* Can't match it without proper knowledge of the Saveblock 2. if (gTrainerBattleOpponent_A >= 300 && gTrainerBattleOpponent_A <= 399) @@ -525,7 +525,7 @@ _0818535E:\n\ lsls r3, 3\n\ adds r3, r7, r3\n\ str r3, [sp, 0x8]\n\ - ldr r5, =sRecordedBattle_Players\n\ + ldr r5, =sPlayers\n\ mov r8, r6\n\ mov r12, r6\n\ movs r4, 0x96\n\ @@ -536,7 +536,7 @@ _0818535E:\n\ adds r4, r7, r0\n\ _081853AC:\n\ lsls r1, r6, 3\n\ - ldr r0, =sRecordedBattle_Players\n\ + ldr r0, =sPlayers\n\ adds r0, 0x4\n\ mov r3, r8\n\ adds r2, r3, r0\n\ @@ -578,7 +578,7 @@ _081853BA:\n\ ldr r5, =gRecordedBattleRngSeed\n\ ldr r0, [r5]\n\ str r0, [r1]\n\ - ldr r0, =sRecordedBattle_BattleFlags\n\ + ldr r0, =sBattleFlags\n\ ldr r2, [r0]\n\ movs r0, 0x2\n\ ands r0, r2\n\ @@ -608,7 +608,7 @@ _08185454:\n\ ands r2, r0\n\ cmp r2, 0\n\ beq _081854E2\n\ - ldr r2, =sRecordedBattle_Players\n\ + ldr r2, =sPlayers\n\ ldrh r0, [r2, 0xE]\n\ cmp r0, 0x1\n\ beq _081854A8\n\ @@ -630,7 +630,7 @@ _0818547E:\n\ lsls r0, r1, 2\n\ adds r0, r1\n\ lsls r0, 2\n\ - ldr r4, =sRecordedBattle_Players\n\ + ldr r4, =sPlayers\n\ adds r0, r4\n\ ldrh r1, [r0, 0xE]\n\ movs r0, 0x1\n\ @@ -647,7 +647,7 @@ _081854A8:\n\ lsls r0, r1, 2\n\ adds r0, r1\n\ lsls r0, 2\n\ - ldr r1, =sRecordedBattle_Players\n\ + ldr r1, =sPlayers\n\ adds r0, r1\n\ ldrh r1, [r0, 0xE]\n\ movs r0, 0x1\n\ @@ -700,7 +700,7 @@ _081854E2:\n\ ldr r5, =0x000004fc\n\ adds r1, r7, r5\n\ strb r0, [r1]\n\ - ldr r0, =sRecordedBattle_FrontierFacility\n\ + ldr r0, =sFrontierFacility\n\ ldrb r1, [r0]\n\ adds r2, 0x3\n\ adds r0, r7, r2\n\ @@ -735,7 +735,7 @@ _081854E2:\n\ movs r2, 0xA0\n\ lsls r2, 3\n\ adds r1, r7, r2\n\ - ldr r3, =sRecordedBattle_AI_Scripts\n\ + ldr r3, =sAI_Scripts\n\ ldr r0, [r3]\n\ str r0, [r1]\n\ ldr r4, =0xfffffed4\n\ @@ -1354,11 +1354,11 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) gPartnerTrainerId = src->partnerId; gUnknown_0203C7B4 = src->field_4FA; sUnknown_0203C7AD = gSaveBlock2Ptr->frontierChosenLvl; - sRecordedBattle_FrontierFacility = src->field_4FD; + sFrontierFacility = src->field_4FD; sUnknown_0203C7AF = src->field_4FE; - sRecordedBattle_BattleStyle = src->battleStyle; - sRecordedBattle_TextSpeed = src->textSpeed; - sRecordedBattle_AI_Scripts = src->AI_scripts; + sBattleStyle = src->battleStyle; + sTextSpeed = src->textSpeed; + sAI_Scripts = src->AI_scripts; for (i = 0; i < 8; i++) { @@ -1417,7 +1417,7 @@ static void CB2_RecordedBattle(void) u8 GetRecordedBattleFrontierFacility(void) { - return sRecordedBattle_FrontierFacility; + return sFrontierFacility; } u8 sub_8185EAC(void) @@ -1480,12 +1480,12 @@ u8 sub_8185FAC(void) u8 GetBattleStyleInRecordedBattle(void) { - return sRecordedBattle_BattleStyle; + return sBattleStyle; } u8 GetTextSpeedInRecordedBattle(void) { - return sRecordedBattle_TextSpeed; + return sTextSpeed; } void RecordedBattle_CopyBattlerMoves(void) @@ -1501,7 +1501,7 @@ void RecordedBattle_CopyBattlerMoves(void) for (i = 0; i < 4; i++) { - sRecordedBattle_PlayerMonMoves[gActiveBattler / 2][i] = gBattleMons[gActiveBattler].moves[i]; + sPlayerMonMoves[gActiveBattler / 2][i] = gBattleMons[gActiveBattler].moves[i]; } } @@ -1522,7 +1522,7 @@ void sub_818603C(u8 arg0) { for (j = 0; j < 4; j++) { - if (gBattleMons[battlerId].moves[j] != sRecordedBattle_PlayerMonMoves[battlerId / 2][j]) + if (gBattleMons[battlerId].moves[j] != sPlayerMonMoves[battlerId / 2][j]) break; } if (j != 4) // player's mon's move has been changed @@ -1532,7 +1532,7 @@ void sub_818603C(u8 arg0) { for (k = 0; k < 4; k++) { - if (gBattleMons[battlerId].moves[j] == sRecordedBattle_PlayerMonMoves[battlerId / 2][k]) + if (gBattleMons[battlerId].moves[j] == sPlayerMonMoves[battlerId / 2][k]) { RecordedBattle_SetBattlerAction(battlerId, k); break; @@ -1612,7 +1612,7 @@ void sub_818603C(u8 arg0) u32 GetAiScriptsInRecordedBattle(void) { - return sRecordedBattle_AI_Scripts; + return sAI_Scripts; } void sub_8186444(void) -- cgit v1.2.3 From c556358e47f7af50ba9b04fc1d7b359512c25b03 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Jul 2018 15:28:57 +0200 Subject: label multiuse sprite template functions --- asm/contest.s | 4 +- asm/contest_link_80F57C4.s | 4 +- asm/pokemon_summary_screen.s | 4 +- asm/script_pokemon_util_80F87D8.s | 4 +- asm/trade.s | 4 +- data/data2b.s | 2 +- include/pokemon.h | 8 +-- src/battle_controller_link_opponent.c | 21 ++++---- src/battle_controller_link_partner.c | 17 +++---- src/battle_controller_opponent.c | 21 ++++---- src/battle_controller_player.c | 35 +++++++------ src/battle_controller_player_partner.c | 22 ++++---- src/battle_controller_recorded_opponent.c | 17 +++---- src/battle_controller_recorded_player.c | 21 ++++---- src/battle_controller_safari.c | 8 +-- src/battle_controller_wally.c | 17 +++---- src/battle_dome_cards.c | 13 +++-- src/battle_main.c | 6 +-- src/egg_hatch.c | 6 +-- src/evolution_scene.c | 31 ++++++------ src/pokeblock_feed.c | 5 +- src/pokemon.c | 84 ++++++++++++++++--------------- src/reshow_battle_screen.c | 19 ++++--- 23 files changed, 183 insertions(+), 190 deletions(-) diff --git a/asm/contest.s b/asm/contest.s index 327a80d75..453ecb04c 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6770,8 +6770,8 @@ _080DB1CC: bl LoadCompressedPalette adds r0, r5, 0 movs r1, 0 - bl sub_806A068 - ldr r4, =gUnknown_0202499C + bl SetMultiuseSpriteTemplateToPokemon + ldr r4, =gMultiuseSpriteTemplate movs r0, 0x2 adds r1, r5, 0 movs r2, 0 diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index 450a235d5..ba1fa1c29 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -1420,8 +1420,8 @@ _080F64F2: bl LoadCompressedObjectPalette adds r0, r6, 0 movs r1, 0x1 - bl sub_806A068 - ldr r0, =gUnknown_0202499C + bl SetMultiuseSpriteTemplateToPokemon + ldr r0, =gMultiuseSpriteTemplate ldrh r1, [r4, 0x4] strh r1, [r0, 0x2] movs r1, 0x88 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index e52874f57..ff848df08 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -1092,7 +1092,7 @@ _081C4750: bl LoadCompressedObjectPalette ldrh r0, [r4, 0x4] movs r1, 0x1 - bl sub_806A068 + bl SetMultiuseSpriteTemplateToPokemon _081C4768: ldrh r0, [r6] adds r0, 0x1 @@ -1144,7 +1144,7 @@ sub_81C47B4: @ 81C47B4 ldr r0, =gUnknown_0203CF1C ldr r6, [r0] adds r6, 0x70 - ldr r0, =gUnknown_0202499C + ldr r0, =gMultiuseSpriteTemplate movs r1, 0x28 movs r2, 0x40 movs r3, 0x5 diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index 18a0cec88..1d4173c4c 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -737,8 +737,8 @@ _080F8DD8: bl LoadCompressedObjectPalette adds r0, r6, 0 movs r1, 0x1 - bl sub_806A068 - ldr r0, =gUnknown_0202499C + bl SetMultiuseSpriteTemplateToPokemon + ldr r0, =gMultiuseSpriteTemplate ldrh r1, [r4, 0x4] strh r1, [r0, 0x2] mov r1, r9 diff --git a/asm/trade.s b/asm/trade.s index 0d7353938..061e338cd 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7174,8 +7174,8 @@ _0807ADE0: bl GetMonSpritePalStruct ldrh r0, [r0, 0x4] adds r1, r4, 0 - bl sub_806A068 - ldr r0, =gUnknown_0202499C + bl SetMultiuseSpriteTemplateToPokemon + ldr r0, =gMultiuseSpriteTemplate movs r1, 0x78 movs r2, 0x3C movs r3, 0x6 diff --git a/data/data2b.s b/data/data2b.s index de32e9775..87ca0b881 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -235,7 +235,7 @@ gUnknown_082FF704:: @ 82FF704 .2byte 0x0003, 0x0000, 0xffff, 0x0000 .align 2 -gUnknown_082FF70C:: @ 82FF70C +gPlayerMonSpriteAnimsTable:: @ 82FF70C .4byte gUnknown_082FF6EC .4byte gUnknown_082FF6F4 .4byte gUnknown_082FF6FC diff --git a/include/pokemon.h b/include/pokemon.h index f928243d0..f36284f12 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -438,7 +438,7 @@ extern u8 gPlayerPartyCount; extern struct Pokemon gPlayerParty[PARTY_SIZE]; extern u8 gEnemyPartyCount; extern struct Pokemon gEnemyParty[PARTY_SIZE]; -extern struct SpriteTemplate gUnknown_0202499C; +extern struct SpriteTemplate gMultiuseSpriteTemplate; extern struct PokemonStorage* gPokemonStoragePtr; extern const struct BattleMove gBattleMoves[]; @@ -505,9 +505,9 @@ u8 GetDefaultMoveTarget(u8 battlerId); u8 GetMonGender(struct Pokemon *mon); u8 GetBoxMonGender(struct BoxPokemon *boxMon); u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality); -void sub_806A068(u16 species, u8 battlerPosition); -void sub_806A12C(u16 trainerSpriteId, u8 battlerPosition); -void sub_806A1C0(u16 arg0, u8 battlerPosition); +void SetMultiuseSpriteTemplateToPokemon(u16 species, u8 battlerPosition); +void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition); +void SetMultiuseSpriteTemplateToTrainerFront(u16 arg0, u8 battlerPosition); // These are full type signatures for GetMonData() and GetBoxMonData(), // but they are not used since some code erroneously omits the third arg. diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 18963f955..d786dacd1 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -34,7 +34,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern void sub_81851A8(u8 *); extern u16 sub_8068B48(void); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); @@ -191,7 +190,7 @@ static void LinkOpponentBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) LinkOpponentBufferExecCompleted(); @@ -1135,9 +1134,9 @@ static void LinkOpponentHandleLoadMonSprite(void) u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1168,10 +1167,10 @@ static void sub_8066494(u8 battlerId, bool8 dontClearSubstituteBit) species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1302,8 +1301,8 @@ static void LinkOpponentHandleDrawTrainerPic(void) } DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, sub_80A82E4(gActiveBattler)); @@ -1314,7 +1313,7 @@ static void LinkOpponentHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void LinkOpponentHandleTrainerSlide(void) @@ -1327,8 +1326,8 @@ static void LinkOpponentHandleTrainerSlide(void) trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_B); DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 96; gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.x += 32; diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index b2cf62138..9867c14e4 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -34,7 +34,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern void sub_81851A8(u8 *); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); @@ -189,7 +188,7 @@ static void LinkPartnerBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) LinkPartnerBufferExecCompleted(); @@ -1024,9 +1023,9 @@ static void LinkPartnerHandleLoadMonSprite(void) BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1054,10 +1053,10 @@ static void sub_814CC98(u8 battlerId, bool8 dontClearSubstituteBit) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1147,15 +1146,15 @@ static void LinkPartnerHandleDrawTrainerPic(void) } DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void LinkPartnerHandleTrainerSlide(void) diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 2af17d32e..1eaa9da18 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -38,7 +38,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern void sub_81A57E4(u8 battlerId, u16 stringId); extern u8 GetFrontierBrainTrainerPicIndex(void); extern u8 sub_81D5588(u16 trainerId); @@ -200,7 +199,7 @@ static void OpponentBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) OpponentBufferExecCompleted(); @@ -1128,9 +1127,9 @@ static void OpponentHandleLoadMonSprite(void) u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1163,9 +1162,9 @@ static void sub_80613DC(u8 battlerId, bool8 dontClearSubstituteBit) species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); - gBattlerSpriteIds[battlerId] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[battlerId] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1294,8 +1293,8 @@ static void OpponentHandleDrawTrainerPic(void) } DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, sub_80A82E4(gActiveBattler)); @@ -1306,7 +1305,7 @@ static void OpponentHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void OpponentHandleTrainerSlide(void) @@ -1366,8 +1365,8 @@ static void OpponentHandleTrainerSlide(void) } DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 96; gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.x += 32; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 26c2cae98..ef45b60cd 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -39,7 +39,7 @@ extern u16 gBattle_BG0_Y; extern s32 gUnknown_0203CD70; extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct SpriteTemplate gUnknown_0202499C; +extern struct SpriteTemplate gMultiuseSpriteTemplate; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; @@ -47,7 +47,6 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern void sub_81B89AC(u8 arg0); extern void sub_81AABB0(void); -extern void sub_806A068(u16, u8); extern void sub_81A57E4(u8 battlerId, u16 stringId); extern void sub_81851A8(u8 *); @@ -917,7 +916,7 @@ void sub_80587B0(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) PlayerBufferExecCompleted(); @@ -2200,10 +2199,10 @@ static void sub_805B258(u8 battlerId, bool8 dontClearSubstituteBit) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -2282,7 +2281,7 @@ static void PlayerHandleDrawTrainerPic(void) } else { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_BRENDAN; } } else @@ -2292,9 +2291,9 @@ static void PlayerHandleDrawTrainerPic(void) if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != 0) // second mon + if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != B_FLANK_LEFT) // Second mon, on the right. xPos = 90; - else // first mon + else // First mon, on the left. xPos = 32; if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) @@ -2319,8 +2318,8 @@ static void PlayerHandleDrawTrainerPic(void) { trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender); DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerFront(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -2330,12 +2329,12 @@ static void PlayerHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1; } - // use the back pic in any other scenario + // Use the back pic in any other scenario. else { DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -2343,7 +2342,7 @@ static void PlayerHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; } - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void PlayerHandleTrainerSlide(void) @@ -2364,17 +2363,17 @@ static void PlayerHandleTrainerSlide(void) } else { - trainerPicId = gLinkPlayers[GetMultiplayerId()].gender; + trainerPicId = gLinkPlayers[GetMultiplayerId()].gender + TRAINER_BACK_PIC_BRENDAN; } } else { - trainerPicId = gSaveBlock2Ptr->playerGender; + trainerPicId = gSaveBlock2Ptr->playerGender + TRAINER_BACK_PIC_BRENDAN; } DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 80, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, 30); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 80, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index d7878678a..cd3a94692 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -35,7 +35,7 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_81358F4(void); extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); +extern void SetMultiuseSpriteTemplateToPokemon(u16, u8); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions @@ -204,7 +204,7 @@ static void PlayerPartnerBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) PlayerPartnerBufferExecCompleted(); @@ -1211,9 +1211,9 @@ static void PlayerPartnerHandleLoadMonSprite(void) BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1241,10 +1241,10 @@ static void sub_81BD0E4(u8 battlerId, bool8 dontClearSubstituteBit) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1326,8 +1326,8 @@ static void PlayerPartnerHandleDrawTrainerPic(void) if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1337,8 +1337,8 @@ static void PlayerPartnerHandleDrawTrainerPic(void) else // otherwise use front sprite { DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerFront(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1349,7 +1349,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1; } - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void PlayerPartnerHandleTrainerSlide(void) diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 1fd1deebf..affcb09ab 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -37,7 +37,6 @@ extern u8 gUnknown_0203C7B4; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern u16 sub_8068B48(void); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); @@ -193,7 +192,7 @@ static void RecordedOpponentBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) RecordedOpponentBufferExecCompleted(); @@ -1119,9 +1118,9 @@ static void RecordedOpponentHandleLoadMonSprite(void) u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1154,9 +1153,9 @@ static void sub_81885D8(u8 battlerId, bool8 dontClearSubstituteBit) species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); - gBattlerSpriteIds[battlerId] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[battlerId] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1252,8 +1251,8 @@ static void RecordedOpponentHandleDrawTrainerPic(void) } DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, sub_80A82E4(gActiveBattler)); @@ -1264,7 +1263,7 @@ static void RecordedOpponentHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void RecordedOpponentHandleTrainerSlide(void) diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index b6a96b6fd..4f224bc67 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -36,7 +36,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions @@ -190,7 +189,7 @@ static void RecordedPlayerBufferRunCommand(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) RecordedPlayerBufferExecCompleted(); @@ -1107,9 +1106,9 @@ static void RecordedPlayerHandleLoadMonSprite(void) BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - sub_806A068(species, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(gActiveBattler, 2), GetBattlerSpriteDefault_Y(gActiveBattler), sub_80A82E4(gActiveBattler)); @@ -1137,10 +1136,10 @@ static void sub_818BA6C(u8 battlerId, bool8 dontClearSubstituteBit) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); gBattlerSpriteIds[battlerId] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); @@ -1242,8 +1241,8 @@ static void RecordedPlayerHandleDrawTrainerPic(void) { trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender); DecompressTrainerFrontPic(trainerPicId, gActiveBattler); - sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerFront(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag); gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1256,8 +1255,8 @@ static void RecordedPlayerHandleDrawTrainerPic(void) else { DecompressTrainerBackPic(trainerPicId, gActiveBattler); - sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, sub_80A82E4(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; @@ -1265,7 +1264,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; } - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void RecordedPlayerHandleTrainerSlide(void) diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index bc69e2624..f7be76c9b 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -239,7 +239,7 @@ static void HandleInputChooseAction(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) SafariBufferExecCompleted(); @@ -358,9 +358,9 @@ static void SafariHandleReturnMonToBall(void) static void SafariHandleDrawTrainerPic(void) { DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, gActiveBattler); - sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(gActiveBattler)); + SetMultiuseSpriteTemplateToTrainerBack(gSaveBlock2Ptr->playerGender, GetBattlerPosition(gActiveBattler)); gBattlerSpriteIds[gActiveBattler] = CreateSprite( - &gUnknown_0202499C, + &gMultiuseSpriteTemplate, 80, (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80, 30); @@ -368,7 +368,7 @@ static void SafariHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void SafariHandleTrainerSlide(void) diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index f66a1d773..f024c29c0 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -39,7 +39,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_806A068(u16, u8); // this file's functions static void WallyHandleGetMonData(void); @@ -254,7 +253,7 @@ static void WallyHandleActions(void) } } -static void CompleteOnBankSpriteCallbackDummy(void) +static void CompleteOnBattlerSpriteCallbackDummy(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy) WallyBufferExecCompleted(); @@ -1039,8 +1038,8 @@ static void WallyHandleReturnMonToBall(void) static void WallyHandleDrawTrainerPic(void) { DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, gActiveBattler); - sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 80, 80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords), 30); @@ -1048,14 +1047,14 @@ static void WallyHandleDrawTrainerPic(void) gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC; - gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy; + gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy; } static void WallyHandleTrainerSlide(void) { DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, gActiveBattler); - sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); - gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToTrainerBack(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler)); + gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 80, 80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords), 30); @@ -1466,8 +1465,8 @@ static void sub_816AA80(u8 battlerId) gBattlerPartyIndexes[battlerId] = gBattleBufferA[battlerId][1]; species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); gUnknown_03005D7C[battlerId] = CreateInvisibleSpriteWithCallback(sub_805D714); - sub_806A068(species, GetBattlerPosition(battlerId)); - gBattlerSpriteIds[battlerId] = CreateSprite(&gUnknown_0202499C, + SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battlerId)); + gBattlerSpriteIds[battlerId] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battlerId, 2), GetBattlerSpriteDefault_Y(battlerId), sub_80A82E4(battlerId)); diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 076a4d342..5e659a2e8 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -16,14 +16,15 @@ extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const union AffineAnimCmd *const gUnknown_082FF618[]; extern const union AffineAnimCmd *const gUnknown_082FF694[]; -extern const union AnimCmd *const gUnknown_082FF70C[]; +extern const union AnimCmd *const gPlayerMonSpriteAnimsTable[]; extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES]; extern const union AnimCmd *const *const gUnknown_0830536C[]; extern const u8 gFacilityClassToPicIndex[]; // Static type declarations -struct BattleDomeCard { +struct BattleDomeCard +{ u8 *frames; struct SpriteFrameImage *images; u16 paletteTag; @@ -41,10 +42,12 @@ static EWRAM_DATA struct BattleDomeCard gUnknown_0203CD04[8] = {}; // .rodata static const struct BattleDomeCard gUnknown_0860B058 = {}; -static const struct OamData gUnknown_0860B064 = { +static const struct OamData gUnknown_0860B064 = +{ .size = 3 }; -static const struct OamData gUnknown_0860B06C = { +static const struct OamData gUnknown_0860B06C = +{ .affineMode = 1, .size = 3 }; @@ -158,7 +161,7 @@ static void uns_builder_assign_animtable1(bool8 isTrainer) { if (!isTrainer) { - gUnknown_0203CCEC.anims = gUnknown_082FF70C; + gUnknown_0203CCEC.anims = gPlayerMonSpriteAnimsTable; } else { diff --git a/src/battle_main.c b/src/battle_main.c index 9bec15750..591c299d7 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -300,6 +300,7 @@ u8 gNumberOfMovesToChoose; u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; // rom const data +static const s8 gUnknown_0831ACE0[] ={-32, -16, -16, -32, -32, 0, 0, 0}; // format: attacking type, defending type, damage multiplier // the multiplier is a (decimal) fixed-point number: @@ -307,9 +308,6 @@ u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; // 10 is ×1.0 TYPE_MUL_NORMAL // 05 is ×0.5 TYPE_MUL_NOT_EFFECTIVE // 00 is ×0.0 TYPE_MUL_NO_EFFECT - -static const s8 gUnknown_0831ACE0[] ={-32, -16, -16, -32, -32, 0, 0, 0}; - const u8 gTypeEffectiveness[336] = { TYPE_NORMAL, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE, @@ -2808,7 +2806,7 @@ void sub_8039BB4(struct Sprite *sprite) static void oac_poke_ally_(struct Sprite *sprite) { - if ((gIntroSlideFlags & 1) == 0) + if (!(gIntroSlideFlags & 1)) { sprite->pos2.x -= 2; if (sprite->pos2.x == 0) diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 00e6236fe..1e89650d3 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -57,12 +57,10 @@ extern const u8 gText_NickHatchPrompt[]; extern u8 sav1_map_get_name(void); extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8); -extern void sub_806A068(u16, u8); extern void FadeScreen(u8, u8); extern void overworld_free_bg_tilemaps(void); extern void sub_80AF168(void); extern void ScanlineEffect_Stop(void); -extern void CB2_ReturnToField(void); extern void play_some_sound(void); extern void DoNamingScreen(u8, const u8*, u16, u8, u32, MainCallback); extern u16 sub_80D22D0(void); @@ -437,8 +435,8 @@ static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID, u16* speciesLoc } break; case 1: - sub_806A068(GetMonSpritePalStruct(mon)->tag, r5); - spriteID = CreateSprite(&gUnknown_0202499C, 120, 75, 6); + SetMultiuseSpriteTemplateToPokemon(GetMonSpritePalStruct(mon)->tag, r5); + spriteID = CreateSprite(&gMultiuseSpriteTemplate, 120, 75, 6); gSprites[spriteID].invisible = 1; gSprites[spriteID].callback = SpriteCallbackDummy; break; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 84f00418c..7079375f8 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -62,7 +62,6 @@ extern const u8 gText_CommunicationStandby5[]; extern void sub_80356D0(void); extern void sub_807B154(void); -extern void sub_806A068(u16, u8); extern void sub_807F19C(void); extern void sub_807B140(void); extern void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies); @@ -280,9 +279,9 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, pokePal = GetMonSpritePalStructFromOtIdPersonality(currSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x110, 0x20); - sub_806A068(currSpecies, 1); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->preEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(currSpecies, 1); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->preEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 1; @@ -295,9 +294,9 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, pokePal = GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); - sub_806A068(speciesToEvolve, 3); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(speciesToEvolve, 3); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 2; gSprites[ID].invisible = 1; @@ -373,9 +372,9 @@ static void CB2_EvolutionSceneLoadGraphics(void) LoadCompressedPalette(pokePal->data, 0x120, 0x20); - sub_806A068(postEvoSpecies, 3); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 2; @@ -450,9 +449,9 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) { u8 ID; - sub_806A068(postEvoSpecies, 1); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 1); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 2; @@ -509,9 +508,9 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri pokePal = GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); - sub_806A068(speciesToEvolve, 1); - gUnknown_0202499C.affineAnims = gDummySpriteAffineAnimTable; - sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gUnknown_0202499C, 120, 64, 30); + SetMultiuseSpriteTemplateToPokemon(speciesToEvolve, 1); + gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; + sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[ID].callback = SpriteCallbackDummy_2; gSprites[ID].oam.paletteNum = 2; diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index d3fdbd355..7ce7affcc 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -58,7 +58,6 @@ extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const u16 gUnknown_0860F074[]; extern bool8 sub_81221EC(void); -extern void sub_806A068(u16, u8); extern void LoadSav2WindowGfx(u8, u16, u8); // this file's functions @@ -661,7 +660,7 @@ static bool8 LoadMonAndSceneGfx(struct Pokemon *mon) palette = GetMonSpritePalStructFromOtIdPersonality(species, trainerId, personality); LoadCompressedObjectPalette(palette); - sub_806A068(palette->tag, 1); + SetMultiuseSpriteTemplateToPokemon(palette->tag, 1); sPokeblockFeed->loadGfxState++; break; case 2: @@ -827,7 +826,7 @@ static void Task_PaletteFadeToReturn(u8 taskId) static u8 CreateMonSprite(struct Pokemon* mon) { u16 species = GetMonData(mon, MON_DATA_SPECIES2); - u8 spriteId = CreateSprite(&gUnknown_0202499C, 48, 80, 2); + u8 spriteId = CreateSprite(&gMultiuseSpriteTemplate, 48, 80, 2); sPokeblockFeed->species = species; sPokeblockFeed->monSpriteId_ = spriteId; diff --git a/src/pokemon.c b/src/pokemon.c index d06da3e9e..80c1ab784 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -63,7 +63,7 @@ extern const struct SpriteFrameImage gUnknown_082FF4F8[]; extern const struct SpriteFrameImage gUnknown_082FF518[]; extern const union AffineAnimCmd *const gUnknown_082FF618[]; extern const union AffineAnimCmd *const gUnknown_082FF694[]; -extern const union AnimCmd *gUnknown_082FF70C[]; +extern const union AnimCmd *gPlayerMonSpriteAnimsTable[]; extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[]; extern const union AnimCmd *const *const gUnknown_08305D0C[]; extern const union AnimCmd *const *const gUnknown_0830536C[]; @@ -105,7 +105,7 @@ EWRAM_DATA u8 gPlayerPartyCount = 0; EWRAM_DATA u8 gEnemyPartyCount = 0; EWRAM_DATA struct Pokemon gPlayerParty[PARTY_SIZE] = {0}; EWRAM_DATA struct Pokemon gEnemyParty[PARTY_SIZE] = {0}; -EWRAM_DATA struct SpriteTemplate gUnknown_0202499C = {0}; +EWRAM_DATA struct SpriteTemplate gMultiuseSpriteTemplate = {0}; EWRAM_DATA struct Unknown_806F160_Struct *gUnknown_020249B4[2] = {NULL}; // const rom data @@ -2486,13 +2486,14 @@ static bool8 ShouldGetStatBadgeBoost(u16 badgeFlag, u8 battlerId) { if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER)) return FALSE; - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) + else if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) return FALSE; - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) return FALSE; - if (FlagGet(badgeFlag)) + else if (FlagGet(badgeFlag)) return TRUE; - return FALSE; + else + return FALSE; } u8 GetDefaultMoveTarget(u8 battlerId) @@ -2561,53 +2562,53 @@ u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality) return MON_MALE; } -void sub_806A068(u16 species, u8 battlerPosition) +void SetMultiuseSpriteTemplateToPokemon(u16 species, u8 battlerPosition) { if (gMonSpritesGfxPtr != NULL) - gUnknown_0202499C = gMonSpritesGfxPtr->templates[battlerPosition]; + gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition]; else if (gUnknown_020249B4[0]) - gUnknown_0202499C = gUnknown_020249B4[0]->templates[battlerPosition]; + gMultiuseSpriteTemplate = gUnknown_020249B4[0]->templates[battlerPosition]; else if (gUnknown_020249B4[1]) - gUnknown_0202499C = gUnknown_020249B4[1]->templates[battlerPosition]; + gMultiuseSpriteTemplate = gUnknown_020249B4[1]->templates[battlerPosition]; else - gUnknown_0202499C = gUnknown_08329D98[battlerPosition]; + gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition]; - gUnknown_0202499C.paletteTag = species; - if (battlerPosition == 0 || battlerPosition == 2) - gUnknown_0202499C.anims = gUnknown_082FF70C; + gMultiuseSpriteTemplate.paletteTag = species; + if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT) + gMultiuseSpriteTemplate.anims = gPlayerMonSpriteAnimsTable; else if (species > 500) - gUnknown_0202499C.anims = gMonAnimationsSpriteAnimsPtrTable[species - 500]; + gMultiuseSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species - 500]; else - gUnknown_0202499C.anims = gMonAnimationsSpriteAnimsPtrTable[species]; + gMultiuseSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species]; } -void sub_806A12C(u16 trainerSpriteId, u8 battlerPosition) +void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition) { - gUnknown_0202499C.paletteTag = trainerSpriteId; + gMultiuseSpriteTemplate.paletteTag = trainerSpriteId; if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT) { - gUnknown_0202499C = gUnknown_08329DF8[trainerSpriteId]; - gUnknown_0202499C.anims = gUnknown_08305D0C[trainerSpriteId]; + gMultiuseSpriteTemplate = gUnknown_08329DF8[trainerSpriteId]; + gMultiuseSpriteTemplate.anims = gUnknown_08305D0C[trainerSpriteId]; } else { if (gMonSpritesGfxPtr != NULL) - gUnknown_0202499C = gMonSpritesGfxPtr->templates[battlerPosition]; + gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition]; else - gUnknown_0202499C = gUnknown_08329D98[battlerPosition]; - gUnknown_0202499C.anims = gUnknown_0830536C[trainerSpriteId]; + gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition]; + gMultiuseSpriteTemplate.anims = gUnknown_0830536C[trainerSpriteId]; } } -void sub_806A1C0(u16 arg0, u8 battlerPosition) +void SetMultiuseSpriteTemplateToTrainerFront(u16 arg0, u8 battlerPosition) { if (gMonSpritesGfxPtr != NULL) - gUnknown_0202499C = gMonSpritesGfxPtr->templates[battlerPosition]; + gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition]; else - gUnknown_0202499C = gUnknown_08329D98[battlerPosition]; + gMultiuseSpriteTemplate = gUnknown_08329D98[battlerPosition]; - gUnknown_0202499C.paletteTag = arg0; - gUnknown_0202499C.anims = gUnknown_0830536C[arg0]; + gMultiuseSpriteTemplate.paletteTag = arg0; + gMultiuseSpriteTemplate.anims = gUnknown_0830536C[arg0]; } static void EncryptBoxMon(struct BoxPokemon *boxMon) @@ -3136,7 +3137,8 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg) { - const u8* data = dataArg; + const u8 *data = dataArg; + switch (field) { case MON_DATA_STATUS: @@ -3179,7 +3181,7 @@ void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg) void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) { - const u8* data = dataArg; + const u8 *data = dataArg; struct PokemonSubstruct0 *substruct0 = NULL; struct PokemonSubstruct1 *substruct1 = NULL; @@ -4511,7 +4513,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) else holdEffect = ItemId_GetHoldEffect(heldItem); - if (holdEffect == 38 && type != 3) + if (holdEffect == HOLD_EFFECT_PREVENT_EVOLVE && type != 3) return 0; switch (type) @@ -4849,16 +4851,17 @@ u8 GetTrainerEncounterMusicId(u16 trainerOpponentId) { if (InBattlePyramid()) return GetTrainerEncounterMusicIdInBattlePyramind(trainerOpponentId); - if (sub_81D5C18()) + else if (sub_81D5C18()) return sub_81D63C8(trainerOpponentId); - return TRAINER_ENCOUNTER_MUSIC(trainerOpponentId); + else + return TRAINER_ENCOUNTER_MUSIC(trainerOpponentId); } u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex) { if (statIndex < 1 || statIndex > 5) { - // should just be "return n", but it wouldn't match without this + // Should just be "return n", but it wouldn't match without this. u16 retVal = n; retVal++; retVal--; @@ -5165,7 +5168,7 @@ void PartySpreadPokerus(struct Pokemon *party) { if (pokerus & 0xF) { - // spread to adjacent party members + // Spread to adjacent party members. if (i != 0 && !(GetMonData(&party[i - 1], MON_DATA_POKERUS, 0) & 0xF0)) SetMonData(&party[i - 1], MON_DATA_POKERUS, &curPokerus); if (i != (PARTY_SIZE - 1) && !(GetMonData(&party[i + 1], MON_DATA_POKERUS, 0) & 0xF0)) @@ -5365,11 +5368,11 @@ u16 GetBattleBGM(void) { if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) return MUS_BATTLE34; - if (gBattleTypeFlags & BATTLE_TYPE_REGI) + else if (gBattleTypeFlags & BATTLE_TYPE_REGI) return MUS_BATTLE36; - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) return MUS_BATTLE20; - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { u8 trainerClass; @@ -5414,7 +5417,8 @@ u16 GetBattleBGM(void) return MUS_BATTLE20; } } - return MUS_BATTLE27; + else + return MUS_BATTLE27; } void PlayBattleBGM(void) @@ -5948,7 +5952,7 @@ static void sub_806F1FC(struct Unknown_806F160_Struct* structPtr) structPtr->frameImages[i * structPtr->field_0_0 + j].data = &structPtr->byteArrays[i][j * 0x800]; } structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->field_0_0]; - structPtr->templates[i].anims = gUnknown_082FF70C; + structPtr->templates[i].anims = gPlayerMonSpriteAnimsTable; structPtr->templates[i].paletteTag = i; } } diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 4d5240bc7..60580ef2d 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -27,8 +27,7 @@ extern u16 gBattle_BG3_Y; extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[]; -extern void sub_806A068(u16 species, u8 battlerPosition); -extern void sub_806A12C(u16 backPicId, u8 battlerPosition); +extern void SetMultiuseSpriteTemplateToTrainerBack(u16 backPicId, u8 battlerPosition); // this file's functions static void CB2_ReshowBattleScreenAfterMenu(void); @@ -235,8 +234,8 @@ static void CreateBattlerSprite(u8 battler) if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_HP) == 0) return; - sub_806A068(GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler)); - gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler)); + SetMultiuseSpriteTemplateToPokemon(GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler)); + gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; gSprites[gBattlerSpriteIds[battler]].data[0] = battler; @@ -248,8 +247,8 @@ static void CreateBattlerSprite(u8 battler) } else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == B_POSITION_PLAYER_LEFT) { - sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT)); - gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50, + SetMultiuseSpriteTemplateToTrainerBack(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT)); + gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 0x50, (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80, sub_80A82E4(0)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; @@ -258,8 +257,8 @@ static void CreateBattlerSprite(u8 battler) } else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) { - sub_806A12C(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(0)); - gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50, + SetMultiuseSpriteTemplateToTrainerBack(TRAINER_BACK_PIC_WALLY, GetBattlerPosition(0)); + gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 0x50, (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].coords) * 4 + 80, sub_80A82E4(0)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; @@ -271,8 +270,8 @@ static void CreateBattlerSprite(u8 battler) if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_HP) == 0) return; - sub_806A068(GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler)); - gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler)); + SetMultiuseSpriteTemplateToPokemon(GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler)); + gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler)); gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; gSprites[gBattlerSpriteIds[battler]].data[0] = battler; -- cgit v1.2.3 From e6d67c7c2299a0c6fa7ec79fa1427c4a1277a6f7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Jul 2018 15:45:47 +0200 Subject: give labels to player controller functions --- src/battle_controller_player.c | 66 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index ef45b60cd..992d8656c 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -122,11 +122,11 @@ static void HandleMoveSwitchting(void); static void sub_8058FC0(void); static void sub_8059828(void); static void CompleteWhenChoseItem(void); -static void sub_8059544(u8 taskId); +static void Task_LaunchLvlUpAnim(u8 taskId); static void Task_PrepareToGiveExpWithExpBar(u8 taskId); static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId); static void sub_8059400(u8 taskId); -static void sub_80595A4(u8 taskId); +static void Task_UpdateLvlInHealthbox(u8 taskId); static void PrintLinkStandbyMsg(void); static u32 CopyPlayerMonData(u8 monId, u8 *dst); static void SetPlayerMonData(u8 monId); @@ -1143,16 +1143,16 @@ static void CompleteOnInactiveTextPrinter(void) #define tExpTask_monId data[0] #define tExpTask_gainedExp data[1] -#define tExpTask_bank data[2] +#define tExpTask_battler data[2] #define tExpTask_frames data[10] static void Task_GiveExpToMon(u8 taskId) { u32 monId = (u8)(gTasks[taskId].tExpTask_monId); - u8 battlerId = gTasks[taskId].tExpTask_bank; + u8 battlerId = gTasks[taskId].tExpTask_battler; s16 gainedExp = gTasks[taskId].tExpTask_gainedExp; - if (IsDoubleBattle() == TRUE || monId != gBattlerPartyIndexes[battlerId]) // give exp without the expbar + if (IsDoubleBattle() == TRUE || monId != gBattlerPartyIndexes[battlerId]) // Give exp without moving the expbar. { struct Pokemon *mon = &gPlayerParty[monId]; u16 species = GetMonData(mon, MON_DATA_SPECIES); @@ -1162,19 +1162,19 @@ static void Task_GiveExpToMon(u8 taskId) if (currExp + gainedExp >= nextLvlExp) { - u8 savedActiveBank; + u8 savedActiveBattler; SetMonData(mon, MON_DATA_EXP, &nextLvlExp); CalculateMonStats(mon); gainedExp -= nextLvlExp - currExp; - savedActiveBank = gActiveBattler; + savedActiveBattler = gActiveBattler; gActiveBattler = battlerId; BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); - gActiveBattler = savedActiveBank; + gActiveBattler = savedActiveBattler; if (IsDoubleBattle() == TRUE && ((u16)(monId) == gBattlerPartyIndexes[battlerId] || (u16)(monId) == gBattlerPartyIndexes[battlerId ^ BIT_FLANK])) - gTasks[taskId].func = sub_8059544; + gTasks[taskId].func = Task_LaunchLvlUpAnim; else gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter; } @@ -1196,7 +1196,7 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId) { u8 monIndex = gTasks[taskId].tExpTask_monId; s32 gainedExp = gTasks[taskId].tExpTask_gainedExp; - u8 battlerId = gTasks[taskId].tExpTask_bank; + u8 battlerId = gTasks[taskId].tExpTask_battler; struct Pokemon *mon = &gPlayerParty[monIndex]; u8 level = GetMonData(mon, MON_DATA_LEVEL); u16 species = GetMonData(mon, MON_DATA_SPECIES); @@ -1221,12 +1221,12 @@ static void sub_8059400(u8 taskId) { u8 monId = gTasks[taskId].tExpTask_monId; s16 gainedExp = gTasks[taskId].tExpTask_gainedExp; - u8 battlerId = gTasks[taskId].tExpTask_bank; - s16 r4; + u8 battlerId = gTasks[taskId].tExpTask_battler; + s16 newExpPoints; - r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); + newExpPoints = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (r4 == -1) + if (newExpPoints == -1) // The bar has been filled with given exp points. { u8 level; s32 currExp; @@ -1241,16 +1241,16 @@ static void sub_8059400(u8 taskId) if (currExp + gainedExp >= expOnNextLvl) { - u8 savedActiveBank; + u8 savedActiveBattler; SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &expOnNextLvl); CalculateMonStats(&gPlayerParty[monId]); gainedExp -= expOnNextLvl - currExp; - savedActiveBank = gActiveBattler; + savedActiveBattler = gActiveBattler; gActiveBattler = battlerId; BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); - gActiveBattler = savedActiveBank; - gTasks[taskId].func = sub_8059544; + gActiveBattler = savedActiveBattler; + gTasks[taskId].func = Task_LaunchLvlUpAnim; } else { @@ -1263,27 +1263,27 @@ static void sub_8059400(u8 taskId) } } -static void sub_8059544(u8 taskId) +static void Task_LaunchLvlUpAnim(u8 taskId) { - u8 battlerId = gTasks[taskId].tExpTask_bank; + u8 battlerId = gTasks[taskId].tExpTask_battler; u8 monIndex = gTasks[taskId].tExpTask_monId; if (IsDoubleBattle() == TRUE && monIndex == gBattlerPartyIndexes[battlerId ^ BIT_FLANK]) battlerId ^= BIT_FLANK; InitAndLaunchSpecialAnimation(battlerId, battlerId, battlerId, B_ANIM_LVL_UP); - gTasks[taskId].func = sub_80595A4; + gTasks[taskId].func = Task_UpdateLvlInHealthbox; } -static void sub_80595A4(u8 taskId) +static void Task_UpdateLvlInHealthbox(u8 taskId) { - u8 battlerId = gTasks[taskId].tExpTask_bank; + u8 battlerId = gTasks[taskId].tExpTask_battler; if (!gBattleSpritesDataPtr->healthBoxesData[battlerId].specialAnimActive) { u8 monIndex = gTasks[taskId].tExpTask_monId; - GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL); // Unused return value + GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL); // Unused return value. if (IsDoubleBattle() == TRUE && monIndex == gBattlerPartyIndexes[battlerId ^ BIT_FLANK]) UpdateHealthboxAttribute(gHealthboxSpriteIds[battlerId ^ BIT_FLANK], &gPlayerParty[monIndex], HEALTHBOX_ALL); @@ -1300,8 +1300,8 @@ static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId) u8 battlerId; monIndex = gTasks[taskId].tExpTask_monId; - GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL); // Unused return value - battlerId = gTasks[taskId].tExpTask_bank; + GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL); // Unused return value. + battlerId = gTasks[taskId].tExpTask_battler; gBattlerControllerFuncs[battlerId] = CompleteOnInactiveTextPrinter; DestroyTask(taskId); } @@ -2466,7 +2466,7 @@ static void PlayerHandleMoveAnimation(void) gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8); gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16]; gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality; - if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE + if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // Always returns FALSE. { PlayerBufferExecCompleted(); } @@ -2722,19 +2722,19 @@ static void PlayerHandleExpUpdate(void) u8 taskId; LoadBattleBarGfx(1); - GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES); // unused return value - expPointsToGive = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8); + GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES); // Unused return value. + expPointsToGive = T1_READ_16(&gBattleBufferA[gActiveBattler][2]); taskId = CreateTask(Task_GiveExpToMon, 10); gTasks[taskId].tExpTask_monId = monId; gTasks[taskId].tExpTask_gainedExp = expPointsToGive; - gTasks[taskId].tExpTask_bank = gActiveBattler; + gTasks[taskId].tExpTask_battler = gActiveBattler; gBattlerControllerFuncs[gActiveBattler] = nullsub_21; } } #undef tExpTask_monId #undef tExpTask_gainedExp -#undef tExpTask_bank +#undef tExpTask_battler #undef tExpTask_frames static void PlayerHandleStatusIconUpdate(void) @@ -2971,7 +2971,7 @@ static void task05_08033660(u8 taskId) } else { - u8 savedActiveBank = gActiveBattler; + u8 savedActiveBattler = gActiveBattler; gActiveBattler = gTasks[taskId].data[0]; if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI)) @@ -2990,7 +2990,7 @@ static void task05_08033660(u8 taskId) gActiveBattler ^= BIT_FLANK; } gBattlerControllerFuncs[gActiveBattler] = sub_8058B40; - gActiveBattler = savedActiveBank; + gActiveBattler = savedActiveBattler; DestroyTask(taskId); } } -- cgit v1.2.3 From 1c48e585747de0a2273c4b3eb4be114d5214b8a2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 7 Jul 2018 14:24:19 +0200 Subject: small fixes --- include/battle_message.h | 7 +++++++ include/constants/items.h | 4 ++-- include/text.h | 10 ++++++++++ src/battle_message.c | 9 ++++++++- src/fieldmap.c | 6 +++--- src/item.c | 2 +- src/item_icon.c | 2 +- 7 files changed, 32 insertions(+), 8 deletions(-) diff --git a/include/battle_message.h b/include/battle_message.h index cccbae841..147bfa501 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -248,6 +248,13 @@ extern const u8 gText_BattleSwitchWhich4[]; extern const u8 gText_BattleSwitchWhich5[]; extern const u8 gText_SafariBalls[]; extern const u8 gText_SafariBallLeft[]; +extern const u8 gText_Sleep[]; +extern const u8 gText_Poison[]; +extern const u8 gText_Burn[]; +extern const u8 gText_Paralysis[]; +extern const u8 gText_Ice[]; +extern const u8 gText_Confusion[]; +extern const u8 gText_Love[]; extern const u8 gText_SpaceAndSpace[]; extern const u8 gText_CommaSpace[]; extern const u8 gText_Space2[]; diff --git a/include/constants/items.h b/include/constants/items.h index 4ca5cb7df..294499c8b 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -462,8 +462,8 @@ #define ITEM_MAGMA_EMBLEM 375 #define ITEM_OLD_SEA_MAP 376 -#define ITEM_LAST_ID 376 -#define ITEM_FIELD_ARROW ITEM_LAST_ID + 1 +#define ITEMS_COUNT 377 +#define ITEM_FIELD_ARROW ITEMS_COUNT #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY diff --git a/include/text.h b/include/text.h index 2566b51b7..07a2017b4 100644 --- a/include/text.h +++ b/include/text.h @@ -2,7 +2,17 @@ #define GUARD_TEXT_H #define CHAR_SPACE 0x00 +#define CHAR_PLUS 0x2E #define CHAR_0 0xA1 +#define CHAR_1 0xA2 +#define CHAR_2 0xA3 +#define CHAR_3 0xA4 +#define CHAR_4 0xA5 +#define CHAR_5 0xA6 +#define CHAR_6 0xA7 +#define CHAR_7 0xA8 +#define CHAR_8 0xA9 +#define CHAR_9 0xAA #define CHAR_QUESTION_MARK 0xAC #define CHAR_PERIOD 0xAD #define CHAR_HYPHEN 0xAE diff --git a/src/battle_message.c b/src/battle_message.c index 7d442ea98..32097fd76 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1197,7 +1197,14 @@ const u8 * const gStatNamesTable2[] = }; const u8 gText_SafariBalls[] = _("{HIGHLIGHT DARK_GREY}SAFARI BALLS"); -const u8 gText_SafariBallLeft[] = _("{HIGHLIGHT DARK_GREY}Left: $" "{HIGHLIGHT DARK_GREY}");const u8 gText_Sleep[] = _( "sleep");const u8 gText_Poison[] = _( "poison");const u8 gText_Burn[] = _( "burn");const u8 gText_Paralysis[] = _( "paralysis");const u8 gText_Ice[] = _( "ice");const u8 gText_Confusion[] = _( "confusion");const u8 gText_Love[] = _( "love"); +const u8 gText_SafariBallLeft[] = _("{HIGHLIGHT DARK_GREY}Left: $" "{HIGHLIGHT DARK_GREY}"); +const u8 gText_Sleep[] = _("sleep"); +const u8 gText_Poison[] = _("poison"); +const u8 gText_Burn[] = _("burn"); +const u8 gText_Paralysis[] = _("paralysis"); +const u8 gText_Ice[] = _("ice"); +const u8 gText_Confusion[] = _("confusion"); +const u8 gText_Love[] = _("love"); const u8 gText_SpaceAndSpace[] = _(" and "); const u8 gText_CommaSpace[] = _(", "); const u8 gText_Space2[] = _(" "); diff --git a/src/fieldmap.c b/src/fieldmap.c index 2561bceb7..f57c4b48f 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -380,7 +380,7 @@ u8 MapGridGetZCoordAt(int x, int y) { return 0; } - + return block >> 12; } @@ -559,7 +559,7 @@ void mapdata_from_sav2(void) a0 = 1; else a0 = -1; - + for (j = x; j < x + 15; j++) { if (!sub_8088BF0(&gUnknown_02032318[j + width * i], width, a0)) @@ -922,7 +922,7 @@ bool8 sub_8088BF0(u16* a0, u16 a1, u8 a2) { if (a2 == 0xFF) return FALSE; - + if (a2 == 0) a0 -= a1; else diff --git a/src/item.c b/src/item.c index 30710d08a..c94f29910 100644 --- a/src/item.c +++ b/src/item.c @@ -1024,7 +1024,7 @@ bool8 RemovePyramidBagItem(u16 itemId, u16 count) static u16 SanitizeItemId(u16 itemId) { - if (itemId >= ITEM_LAST_ID + 1) + if (itemId >= ITEMS_COUNT) return ITEM_NONE; else return itemId; diff --git a/src/item_icon.c b/src/item_icon.c index d6fedf892..68ec1daf0 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -162,7 +162,7 @@ const void *GetItemIconPicOrPalette(u16 itemId, u8 which) { if (itemId == 0xFFFF) itemId = ITEM_FIELD_ARROW; - else if (itemId > ITEM_LAST_ID) + else if (itemId >= ITEMS_COUNT) itemId = 0; return gItemIconTable[itemId][which]; -- cgit v1.2.3 From 008d961b2a3d2d145f9ff8e7515cfb4f5e04128c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 7 Jul 2018 19:57:09 +0200 Subject: add party menu defines --- asm/party_menu.s | 8 ++++---- include/battle.h | 6 +++--- include/battle_controllers.h | 7 +++++-- include/party_menu.h | 13 +++++++++++++ include/pokemon.h | 2 +- src/battle_controller_player.c | 26 +++++++++++++------------- src/battle_controllers.c | 4 ++-- src/battle_main.c | 31 ++++++++++++++++--------------- src/battle_script_commands.c | 7 ++++--- src/battle_util.c | 4 ++-- src/pokemon.c | 12 ++++++------ 11 files changed, 69 insertions(+), 51 deletions(-) diff --git a/asm/party_menu.s b/asm/party_menu.s index 6e90fa3c3..017f1dc54 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -16079,8 +16079,8 @@ _081B89A6: bx r1 thumb_func_end sub_81B8984 - thumb_func_start sub_81B89AC -sub_81B89AC: @ 81B89AC + thumb_func_start OpenPartyMenuInBattle +OpenPartyMenuInBattle: @ 81B89AC push {r4,lr} sub sp, 0xC adds r4, r0, 0 @@ -16107,7 +16107,7 @@ sub_81B89AC: @ 81B89AC pop {r0} bx r0 .pool - thumb_func_end sub_81B89AC + thumb_func_end OpenPartyMenuInBattle thumb_func_start sub_81B89F0 sub_81B89F0: @ 81B89F0 @@ -16288,7 +16288,7 @@ _081B8B94: ldrb r0, [r0, 0xB] cmp r0, 0x4 bne _081B8BA8 - bl sub_806E994 + bl SetMonPreventsSwitchingString b _081B8C46 .pool _081B8BA8: diff --git a/include/battle.h b/include/battle.h index 6e941191f..fba5fb460 100644 --- a/include/battle.h +++ b/include/battle.h @@ -177,7 +177,7 @@ struct ProtectStruct /* field_0 */ u32 protected:1; u32 endured:1; - u32 onlyStruggle:1; + u32 noValidMoves:1; u32 helpingHand:1; u32 bounceMove:1; u32 stealMove:1; @@ -456,7 +456,7 @@ struct BattleStruct u8 field_46; u8 field_47; u8 focusPunchBattlerId; - u8 field_49; + u8 battlerPreventingSwitchout; u8 moneyMultiplier; u8 savedTurnActionNumber; u8 switchInAbilitiesCounter; @@ -509,7 +509,7 @@ struct BattleStruct u8 field_A7; u16 hpOnSwitchout[2]; u32 savedBattleTypeFlags; - u8 field_B0; + u8 abilityPreventingSwitchout; u8 hpScale; u8 synchronizeMoveEffect; bool8 anyMonHasTransformed; diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 61e2935b7..8ba45fad1 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -65,6 +65,8 @@ enum REQUEST_TOUGH_RIBBON_BATTLE, }; +// Special arguments for Battle Controller functions. + #define RESET_ACTION_MOVE_SELECTION 0 #define RESET_ACTION_SELECTION 1 #define RESET_MOVE_SELECTION 2 @@ -76,10 +78,11 @@ enum #define BALL_3_SHAKES_SUCCESS 4 #define BALL_TRAINER_BLOCK 5 -#define RET_VALUE_LEVELLED_UP 11 - #define INSTANT_HP_BAR_DROP 32767 +// Special return values in gBattleBufferB from Battle Controller functions. +#define RET_VALUE_LEVELLED_UP 11 + struct UnusedControllerStruct { u8 field_0:7; diff --git a/include/party_menu.h b/include/party_menu.h index 2cf17f1e4..fd52f8d4d 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_PARTY_MENU_H #define GUARD_PARTY_MENU_H + #include "task.h" + enum { AILMENT_NONE, @@ -11,6 +13,16 @@ enum AILMENT_BRN }; +enum +{ + PARTY_CHOOSE_MON, + PARTY_MUST_CHOOSE_MON, + PARTY_CANT_SWITCH, + PARTY_USE_ITEM_ON, + PARTY_ABILITY_PREVENTS, + PARTY_GIVE_ITEM, +}; + struct Struct203CEC8 { u8 filler[0x9]; @@ -38,5 +50,6 @@ void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func); void sub_81B1B5C(void *a, u8 b); u8 sub_81B1BD4(); void sub_81B8448(); +void OpenPartyMenuInBattle(u8 caseId); #endif // GUARD_PARTY_MENU_H diff --git a/include/pokemon.h b/include/pokemon.h index f36284f12..a60ad66be 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -593,7 +593,7 @@ bool8 IsTradedMon(struct Pokemon *mon); bool8 IsOtherTrainer(u32 otId, u8 *otName); void MonRestorePP(struct Pokemon *mon); void BoxMonRestorePP(struct BoxPokemon *boxMon); -void sub_806E994(void); +void SetMonPreventsSwitchingString(void); void SetWildMonHeldItem(void); bool8 IsMonShiny(struct Pokemon *mon); bool8 IsShinyOtIdPersonality(u32 otId, u32 personality); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 992d8656c..8f69dab06 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -30,6 +30,7 @@ #include "battle_setup.h" #include "item_use.h" #include "recorded_battle.h" +#include "party_menu.h" extern u8 gUnknown_0203CEE8; extern u8 gUnknown_0203CEE9; @@ -45,7 +46,6 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81B89AC(u8 arg0); extern void sub_81AABB0(void); extern void sub_81A57E4(u8 battlerId, u16 stringId); extern void sub_81851A8(u8 *); @@ -120,7 +120,7 @@ static void MoveSelectionDisplayMoveType(void); static void MoveSelectionDisplayMoveNames(void); static void HandleMoveSwitchting(void); static void sub_8058FC0(void); -static void sub_8059828(void); +static void WaitForMonSelection(void); static void CompleteWhenChoseItem(void); static void Task_LaunchLvlUpAnim(u8 taskId); static void Task_PrepareToGiveExpWithExpBar(u8 taskId); @@ -1337,21 +1337,21 @@ static void CompleteOnInactiveTextPrinter2(void) PlayerBufferExecCompleted(); } -static void sub_80597CC(void) +static void OpenPartyMenuToChooseMon(void) { if (!gPaletteFade.active) { - u8 r4; + u8 caseId; - gBattlerControllerFuncs[gActiveBattler] = sub_8059828; - r4 = gTasks[gUnknown_03005D7C[gActiveBattler]].data[0]; + gBattlerControllerFuncs[gActiveBattler] = WaitForMonSelection; + caseId = gTasks[gUnknown_03005D7C[gActiveBattler]].data[0]; DestroyTask(gUnknown_03005D7C[gActiveBattler]); FreeAllWindowBuffers(); - sub_81B89AC(r4); + OpenPartyMenuInBattle(caseId); } } -static void sub_8059828(void) +static void WaitForMonSelection(void) { if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { @@ -2655,7 +2655,7 @@ static void PlayerHandleChoosePokemon(void) for (i = 0; i < 3; i++) gUnknown_0203CF00[i] = gBattleBufferA[gActiveBattler][4 + i]; - if (gBattleTypeFlags & BATTLE_TYPE_ARENA && (gBattleBufferA[gActiveBattler][1] & 0xF) != 2) + if (gBattleTypeFlags & BATTLE_TYPE_ARENA && (gBattleBufferA[gActiveBattler][1] & 0xF) != PARTY_CANT_SWITCH) { BtlController_EmitChosenMonReturnValue(1, gBattlerPartyIndexes[gActiveBattler] + 1, gUnknown_0203CF00); PlayerBufferExecCompleted(); @@ -2664,11 +2664,11 @@ static void PlayerHandleChoosePokemon(void) { gUnknown_03005D7C[gActiveBattler] = CreateTask(TaskDummy, 0xFF); gTasks[gUnknown_03005D7C[gActiveBattler]].data[0] = gBattleBufferA[gActiveBattler][1] & 0xF; - *(&gBattleStruct->field_49) = gBattleBufferA[gActiveBattler][1] >> 4; + *(&gBattleStruct->battlerPreventingSwitchout) = gBattleBufferA[gActiveBattler][1] >> 4; *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; - *(&gBattleStruct->field_B0) = gBattleBufferA[gActiveBattler][3]; - BeginNormalPaletteFade(-1, 0, 0, 16, 0); - gBattlerControllerFuncs[gActiveBattler] = sub_80597CC; + *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; + BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerInMenuId = gActiveBattler; } } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index c841aaa03..1ce5d3099 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1181,7 +1181,7 @@ void BtlController_EmitChooseItem(u8 bufferId, u8 *arg1) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4) +void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8 *arg4) { s32 i; @@ -1191,7 +1191,7 @@ void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 ability sBattleBuffersTransferData[3] = abilityId; for (i = 0; i < 3; i++) sBattleBuffersTransferData[4 + i] = arg4[i]; - PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 8); // but only 7 bytes were written + PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 8); // Only 7 bytes were written. } void BtlController_EmitCmd23(u8 bufferId) diff --git a/src/battle_main.c b/src/battle_main.c index 591c299d7..fe6e62c5d 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -51,6 +51,7 @@ #include "decompress.h" #include "international_string_util.h" #include "pokeball.h" +#include "party_menu.h" struct UnknownPokemonStruct4 { @@ -3232,7 +3233,7 @@ void FaintClearSetData(void) gProtectStructs[gActiveBattler].protected = 0; gProtectStructs[gActiveBattler].endured = 0; - gProtectStructs[gActiveBattler].onlyStruggle = 0; + gProtectStructs[gActiveBattler].noValidMoves = 0; gProtectStructs[gActiveBattler].helpingHand = 0; gProtectStructs[gActiveBattler].bounceMove = 0; gProtectStructs[gActiveBattler].stealMove = 0; @@ -4141,11 +4142,11 @@ static void HandleTurnActionSelectionState(void) u8 position = GetBattlerPosition(gActiveBattler); switch (gBattleCommunication[gActiveBattler]) { - case STATE_TURN_START_RECORD: // recorded battle related on start of every turn + case STATE_TURN_START_RECORD: // Recorded battle related action on start of every turn. RecordedBattle_CopyBattlerMoves(); gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; break; - case STATE_BEFORE_ACTION_CHOSEN: // choose an action + case STATE_BEFORE_ACTION_CHOSEN: // Choose an action. *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; if (gBattleTypeFlags & BATTLE_TYPE_MULTI || (position & BIT_FLANK) == B_FLANK_LEFT @@ -4177,7 +4178,7 @@ static void HandleTurnActionSelectionState(void) } } break; - case STATE_WAIT_ACTION_CHOSEN: // try to perform an action + case STATE_WAIT_ACTION_CHOSEN: // Try to perform an action. if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC)))) { RecordedBattle_SetBattlerAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]); @@ -4248,7 +4249,7 @@ static void HandleTurnActionSelectionState(void) || gBattleTypeFlags & BATTLE_TYPE_ARENA || gStatuses3[gActiveBattler] & STATUS3_ROOTED) { - BtlController_EmitChoosePokemon(0, 2, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_CANT_SWITCH, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); } else if ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_SHADOW_TAG)) || ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_ARENA_TRAP)) @@ -4257,16 +4258,16 @@ static void HandleTurnActionSelectionState(void) || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER, gActiveBattler, ABILITY_MAGNET_PULL, 0, 0)) && IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_STEEL))) { - BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | 4, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | PARTY_ABILITY_PREVENTS, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]); } else { if (gActiveBattler == 2 && gChosenActionByBattler[0] == B_ACTION_SWITCH) - BtlController_EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); else if (gActiveBattler == 3 && gChosenActionByBattler[1] == B_ACTION_SWITCH) - BtlController_EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); else - BtlController_EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]); } MarkBattlerForControllerExec(gActiveBattler); break; @@ -4304,7 +4305,7 @@ static void HandleTurnActionSelectionState(void) RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 1); } else if (gChosenActionByBattler[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] == B_ACTION_USE_MOVE - && (gProtectStructs[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].onlyStruggle + && (gProtectStructs[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].noValidMoves || gDisableStructs[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].encoredMove)) { RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 1); @@ -4705,7 +4706,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) { if (gChosenActionByBattler[battler1] == B_ACTION_USE_MOVE) { - if (gProtectStructs[battler1].onlyStruggle) + if (gProtectStructs[battler1].noValidMoves) moveBattler1 = MOVE_STRUGGLE; else moveBattler1 = gBattleMons[battler1].moves[*(gBattleStruct->chosenMovePositions + battler1)]; @@ -4715,7 +4716,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) if (gChosenActionByBattler[battler2] == B_ACTION_USE_MOVE) { - if (gProtectStructs[battler2].onlyStruggle) + if (gProtectStructs[battler2].noValidMoves) moveBattler2 = MOVE_STRUGGLE; else moveBattler2 = gBattleMons[battler2].moves[*(gBattleStruct->chosenMovePositions + battler2)]; @@ -4917,7 +4918,7 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) if (gChosenMoveByBattler[gActiveBattler] == MOVE_FOCUS_PUNCH && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP) && !(gDisableStructs[gBattlerAttacker].truantCounter) - && !(gProtectStructs[gActiveBattler].onlyStruggle)) + && !(gProtectStructs[gActiveBattler].noValidMoves)) { BattleScriptExecute(BattleScript_FocusPunchSetUp); return; @@ -5290,9 +5291,9 @@ static void HandleAction_UseMove(void) gCurrMovePos = gChosenMovePos = *(gBattleStruct->chosenMovePositions + gBattlerAttacker); // choose move - if (gProtectStructs[gBattlerAttacker].onlyStruggle) + if (gProtectStructs[gBattlerAttacker].noValidMoves) { - gProtectStructs[gBattlerAttacker].onlyStruggle = 0; + gProtectStructs[gBattlerAttacker].noValidMoves = 0; gCurrentMove = gChosenMove = MOVE_STRUGGLE; gHitMarker |= HITMARKER_NO_PPDEDUCT; *(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index bacaf2bac..eb6feb2a0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -40,6 +40,7 @@ #include "constants/battle_string_ids.h" #include "battle_setup.h" #include "overworld.h" +#include "party_menu.h" extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; @@ -5143,7 +5144,7 @@ static void sub_804CF10(u8 arg0) *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6; gBattleStruct->field_93 &= ~(gBitTable[gActiveBattler]); - BtlController_EmitChoosePokemon(0, 1, arg0, 0, gBattleStruct->field_60[gActiveBattler]); + BtlController_EmitChoosePokemon(0, PARTY_MUST_CHOOSE_MON, arg0, 0, gBattleStruct->field_60[gActiveBattler]); MarkBattlerForControllerExec(gActiveBattler); } @@ -5382,9 +5383,9 @@ static void atk50_openpartyscreen(void) else { if (gBattlescriptCurrInstr[1] & 0x80) - hitmarkerFaintBits = 0; // used here as the caseId for the EmitChoose function + hitmarkerFaintBits = PARTY_CHOOSE_MON; // Used here as the caseId for the EmitChoose function. else - hitmarkerFaintBits = 1; + hitmarkerFaintBits = PARTY_MUST_CHOOSE_MON; battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(0x80)); if (gSpecialStatuses[battlerId].flag40) diff --git a/src/battle_util.c b/src/battle_util.c index 5d2ec62a9..6e3fc3e7f 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -455,12 +455,12 @@ bool8 AreAllMovesUnusable(void) if (unusable == 0xF) // All moves are unusable. { - gProtectStructs[gActiveBattler].onlyStruggle = 1; + gProtectStructs[gActiveBattler].noValidMoves = 1; gSelectionBattleScripts[gActiveBattler] = BattleScript_NoMovesLeft; } else { - gProtectStructs[gActiveBattler].onlyStruggle = 0; + gProtectStructs[gActiveBattler].noValidMoves = 0; } return (unusable == 0xF); diff --git a/src/pokemon.c b/src/pokemon.c index 80c1ab784..5406cfee9 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5582,19 +5582,19 @@ void BoxMonRestorePP(struct BoxPokemon *boxMon) } } -void sub_806E994(void) +void SetMonPreventsSwitchingString(void) { - gLastUsedAbility = gBattleStruct->field_B0; + gLastUsedAbility = gBattleStruct->abilityPreventingSwitchout; gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN; gBattleTextBuff1[1] = B_BUFF_MON_NICK_WITH_PREFIX; - gBattleTextBuff1[2] = gBattleStruct->field_49; + gBattleTextBuff1[2] = gBattleStruct->battlerPreventingSwitchout; gBattleTextBuff1[4] = B_BUFF_EOS; - if (!GetBattlerSide(gBattleStruct->field_49)) - gBattleTextBuff1[3] = pokemon_order_func(gBattlerPartyIndexes[gBattleStruct->field_49]); + if (GetBattlerSide(gBattleStruct->battlerPreventingSwitchout) == B_SIDE_PLAYER) + gBattleTextBuff1[3] = pokemon_order_func(gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]); else - gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->field_49]; + gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]; PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBattlerInMenuId, pokemon_order_func(gBattlerPartyIndexes[gBattlerInMenuId])) -- cgit v1.2.3 From ee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 7 Jul 2018 21:14:41 +0200 Subject: little touches for HandleTurnActionSelectionState --- src/battle_main.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index fe6e62c5d..88422574f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -163,7 +163,7 @@ static void HandleTurnActionSelectionState(void); static void RunTurnActionsFunctions(void); static void SetActionsAndBattlersTurnOrder(void); static void sub_803CDF8(void); -static bool8 sub_803CDB8(void); +static bool8 AllAtActionConfirmed(void); static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void); static void FreeResetData_ReturnToOvOrDoEvolutions(void); static void ReturnFromBattleToOverworld(void); @@ -4286,8 +4286,8 @@ static void HandleTurnActionSelectionState(void) MarkBattlerForControllerExec(gActiveBattler); break; case B_ACTION_CANCEL_PARTNER: - gBattleCommunication[gActiveBattler] = 7; - gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] = 1; + gBattleCommunication[gActiveBattler] = STATE_WAIT_SET_BEFORE_ACTION; + gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); if (gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_MULTIPLETURNS || gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_RECHARGE) @@ -4330,7 +4330,7 @@ static void HandleTurnActionSelectionState(void) && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN) { gSelectionBattleScripts[gActiveBattler] = BattleScript_AskIfWantsToForfeitMatch; - gBattleCommunication[gActiveBattler] = 8; + gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT_MAY_RUN; *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE; *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_BEFORE_ACTION_CHOSEN; return; @@ -4340,7 +4340,7 @@ static void HandleTurnActionSelectionState(void) && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN) { BattleScriptExecute(BattleScript_PrintCantRunFromTrainer); - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; } else if (IsRunningFromBattleImpossible() && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN) @@ -4382,7 +4382,7 @@ static void HandleTurnActionSelectionState(void) sub_818603C(2); if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF) { - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); } else if (TrySetCantSelectMoveBattleScript()) @@ -4412,7 +4412,7 @@ static void HandleTurnActionSelectionState(void) case B_ACTION_USE_ITEM: if ((gBattleBufferB[gActiveBattler][1] | (gBattleBufferB[gActiveBattler][2] << 8)) == 0) { - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; } else { @@ -4423,7 +4423,7 @@ static void HandleTurnActionSelectionState(void) case B_ACTION_SWITCH: if (gBattleBufferB[gActiveBattler][1] == PARTY_SIZE) { - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); } else @@ -4468,10 +4468,13 @@ static void HandleTurnActionSelectionState(void) case STATE_WAIT_ACTION_CONFIRMED_STANDBY: if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC)))) { - i = (sub_803CDB8() != 0); + if (AllAtActionConfirmed()) + i = TRUE; + else + i = FALSE; if (((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_DOUBLE)) != BATTLE_TYPE_DOUBLE) - || (position & BIT_FLANK) + || (position & BIT_FLANK) != B_FLANK_LEFT || (*(&gBattleStruct->field_91) & gBitTable[GetBattlerAtPosition(position ^ BIT_FLANK)])) { BtlController_EmitLinkStandbyMsg(0, 0, i); @@ -4509,7 +4512,7 @@ static void HandleTurnActionSelectionState(void) case STATE_WAIT_SET_BEFORE_ACTION: if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC)))) { - gBattleCommunication[gActiveBattler] = 1; + gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; } break; case STATE_SELECTION_SCRIPT_MAY_RUN: @@ -4541,7 +4544,7 @@ static void HandleTurnActionSelectionState(void) } } - // check if everyone chose actions + // Check if everyone chose actions. if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gBattlersCount) { sub_818603C(1); @@ -4558,17 +4561,17 @@ static void HandleTurnActionSelectionState(void) } } -static bool8 sub_803CDB8(void) +static bool8 AllAtActionConfirmed(void) { - s32 i, var; + s32 i, count; - for (var = 0, i = 0; i < gBattlersCount; i++) + for (count = 0, i = 0; i < gBattlersCount; i++) { - if (gBattleCommunication[i] == 5) - var++; + if (gBattleCommunication[i] == STATE_WAIT_ACTION_CONFIRMED) + count++; } - if (var + 1 == gBattlersCount) + if (count + 1 == gBattlersCount) return TRUE; else return FALSE; -- cgit v1.2.3 From d675b7578cff2352796c27d3e6fc882090c9ce21 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 10 Jul 2018 18:04:41 -0500 Subject: Move movement type constants into include/constants/event_object_movement_constants.h --- .../constants/event_object_movement_constants.h | 245 ++++++++++++++++++++ include/event_object_movement.h | 247 --------------------- src/event_object_movement.c | 1 + 3 files changed, 246 insertions(+), 247 deletions(-) create mode 100755 include/constants/event_object_movement_constants.h diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h new file mode 100755 index 000000000..2a80f9a09 --- /dev/null +++ b/include/constants/event_object_movement_constants.h @@ -0,0 +1,245 @@ +#ifndef GUARD_CONSTANTS_EVENTOBJMV_H +#define GUARD_CONSTANTS_EVENTOBJMV_H + +#define MOVEMENT_TYPE_NONE 0x0 +#define MOVEMENT_TYPE_LOOK_AROUND 0x1 +#define MOVEMENT_TYPE_WANDER_AROUND 0x2 +#define MOVEMENT_TYPE_WANDER_UP_AND_DOWN 0x3 +#define MOVEMENT_TYPE_WANDER_DOWN_AND_UP 0x4 +#define MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT 0x5 +#define MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT 0x6 +#define MOVEMENT_TYPE_FACE_UP 0x7 +#define MOVEMENT_TYPE_FACE_DOWN 0x8 +#define MOVEMENT_TYPE_FACE_LEFT 0x9 +#define MOVEMENT_TYPE_FACE_RIGHT 0xA +#define MOVEMENT_TYPE_PLAYER 0xB +#define MOVEMENT_TYPE_BERRY_TREE_GROWTH 0xC +#define MOVEMENT_TYPE_FACE_DOWN_AND_UP 0xD +#define MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT 0xE +#define MOVEMENT_TYPE_FACE_UP_AND_LEFT 0xF +#define MOVEMENT_TYPE_FACE_UP_AND_RIGHT 0x10 +#define MOVEMENT_TYPE_FACE_DOWN_AND_LEFT 0x11 +#define MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT 0x12 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT 0x13 +#define MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT 0x14 +#define MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT 0x15 +#define MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT 0x16 +#define MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE 0x17 +#define MOVEMENT_TYPE_ROTATE_CLOCKWISE 0x18 +#define MOVEMENT_TYPE_WALK_UP_AND_DOWN 0x19 +#define MOVEMENT_TYPE_WALK_DOWN_AND_UP 0x1A +#define MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT 0x1B +#define MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT 0x1C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN 0x1D +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP 0x1E +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT 0x1F +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT 0x20 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN 0x21 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP 0x22 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT 0x23 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT 0x24 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT 0x25 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT 0x26 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN 0x27 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP 0x28 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT 0x29 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT 0x2A +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN 0x2B +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP 0x2C +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT 0x2D +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT 0x2E +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP 0x2F +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN 0x30 +#define MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT 0x31 +#define MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT 0x32 +#define MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN 0x33 +#define MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP 0x34 +#define MOVEMENT_TYPE_COPY_PLAYER 0x35 +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE 0x36 +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE 0x37 +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE 0x38 +#define MOVEMENT_TYPE_TREE_DISGUISE 0x39 +#define MOVEMENT_TYPE_MOUNTAIN_DISGUISE 0x3A +#define MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS 0x3B +#define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C +#define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D +#define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E +#define MOVEMENT_TYPE_HIDDEN 0x3F +#define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 +#define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 +#define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 +#define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 +#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 +#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 +#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 +#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 +#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 +#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 +#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A +#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B +#define MOVEMENT_TYPE_INVISIBLE 0x4C +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN 0x4D +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP 0x4E +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT 0x4F +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT 0x50 + +#define MOVEMENT_ACTION_FACE_DOWN 0x0 +#define MOVEMENT_ACTION_FACE_UP 0x1 +#define MOVEMENT_ACTION_FACE_LEFT 0x2 +#define MOVEMENT_ACTION_FACE_RIGHT 0x3 +#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4 +#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5 +#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6 +#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7 +#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8 +#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9 +#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA +#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB +#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC +#define MOVEMENT_ACTION_JUMP_2_UP 0xD +#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE +#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF +#define MOVEMENT_ACTION_DELAY_1 0x10 +#define MOVEMENT_ACTION_DELAY_2 0x11 +#define MOVEMENT_ACTION_DELAY_4 0x12 +#define MOVEMENT_ACTION_DELAY_8 0x13 +#define MOVEMENT_ACTION_DELAY_16 0x14 +#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15 +#define MOVEMENT_ACTION_WALK_FAST_UP 0x16 +#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17 +#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19 +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B +#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F +#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29 +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B +#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C +#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E +#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_SLIDE_DOWN 0x31 +#define MOVEMENT_ACTION_SLIDE_UP 0x32 +#define MOVEMENT_ACTION_SLIDE_LEFT 0x33 +#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34 +#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35 +#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36 +#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37 +#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38 +#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39 +#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A +#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B +#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C +#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D +#define MOVEMENT_ACTION_FACE_PLAYER 0x3E +#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x3F +#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x40 +#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION 0x41 +#define MOVEMENT_ACTION_JUMP_DOWN 0x42 +#define MOVEMENT_ACTION_JUMP_UP 0x43 +#define MOVEMENT_ACTION_JUMP_LEFT 0x44 +#define MOVEMENT_ACTION_JUMP_RIGHT 0x45 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN 0x46 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP 0x47 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT 0x48 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT 0x49 +#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP 0x4A +#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN 0x4B +#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT 0x4C +#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT 0x4D +#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION 0x4E +#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN 0x4F +#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50 +#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51 +#define MOVEMENT_ACTION_DISABLE_ANIMATION 0x52 +#define MOVEMENT_ACTION_RESTORE_ANIMATION 0x53 +#define MOVEMENT_ACTION_SET_INVISIBLE 0x54 +#define MOVEMENT_ACTION_SET_VISIBLE 0x55 +#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x56 +#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x57 +#define MOVEMENT_ACTION_EMOTE_HEART 0x58 +#define MOVEMENT_ACTION_REVEAL_TRAINER 0x59 +#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x5A +#define MOVEMENT_ACTION_CUT_TREE 0x5B +#define MOVEMENT_ACTION_SET_FIXED_PRIORITY 0x5C +#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x5D +#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x5E +#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x5F +#define MOVEMENT_ACTION_UNKNOWN1 0x60 +#define MOVEMENT_ACTION_UNKNOWN2 0x61 +#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x62 +#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x63 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x64 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x65 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x66 +#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x67 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x68 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x69 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x6A +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x6B +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x6C +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x6D +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x6E +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x6F +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x70 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x71 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x72 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x73 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x74 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x75 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x76 +#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x77 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x78 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x79 +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x7A +#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x7B +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x7C +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x7D +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x7E +#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x7F +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x80 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x81 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x82 +#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x83 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x84 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x85 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x86 +#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x87 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x88 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x89 +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x8A +#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x8B +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT 0x8C +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT 0x8D +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT 0x8E +#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x8F +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT 0x90 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT 0x91 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT 0x92 +#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT 0x93 +#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM 0x94 +#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM 0x95 +#define MOVEMENT_ACTION_WALK_LEFT_AFFINE 0x96 +#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE 0x97 +#define MOVEMENT_ACTION_LEVITATE 0x98 +#define MOVEMENT_ACTION_STOP_LEVITATE 0x99 +#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP 0x9A +#define MOVEMENT_ACTION_FIGURE_8 0x9B +#define MOVEMENT_ACTION_FLY_UP 0x9C +#define MOVEMENT_ACTION_FLY_DOWN 0x9D + +#endif // GUARD_CONSTANTS_EVENTOBJMV_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 8a1749b0b..99243e45f 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -4,253 +4,6 @@ #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 -enum -{ - MOVEMENT_TYPE_NONE, - MOVEMENT_TYPE_LOOK_AROUND, - MOVEMENT_TYPE_WANDER_AROUND, - MOVEMENT_TYPE_WANDER_UP_AND_DOWN, - MOVEMENT_TYPE_WANDER_DOWN_AND_UP, - MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, - MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT, - MOVEMENT_TYPE_FACE_UP, - MOVEMENT_TYPE_FACE_DOWN, - MOVEMENT_TYPE_FACE_LEFT, - MOVEMENT_TYPE_FACE_RIGHT, - MOVEMENT_TYPE_PLAYER, - MOVEMENT_TYPE_BERRY_TREE_GROWTH, - MOVEMENT_TYPE_FACE_DOWN_AND_UP, - MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, - MOVEMENT_TYPE_FACE_UP_AND_LEFT, - MOVEMENT_TYPE_FACE_UP_AND_RIGHT, - MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, - MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, - MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT, - MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, - MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, - MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, - MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, - MOVEMENT_TYPE_ROTATE_CLOCKWISE, - MOVEMENT_TYPE_WALK_UP_AND_DOWN, - MOVEMENT_TYPE_WALK_DOWN_AND_UP, - MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, - MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, - MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, - MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, - MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, - MOVEMENT_TYPE_COPY_PLAYER, - MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE, - MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE, - MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE, - MOVEMENT_TYPE_TREE_DISGUISE, - MOVEMENT_TYPE_MOUNTAIN_DISGUISE, - MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, - MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, - MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, - MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, - MOVEMENT_TYPE_HIDDEN, - MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, - MOVEMENT_TYPE_WALK_IN_PLACE_UP, - MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, - MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, - MOVEMENT_TYPE_JOG_IN_PLACE_DOWN, - MOVEMENT_TYPE_JOG_IN_PLACE_UP, - MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, - MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, - MOVEMENT_TYPE_RUN_IN_PLACE_DOWN, - MOVEMENT_TYPE_RUN_IN_PLACE_UP, - MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, - MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT, - MOVEMENT_TYPE_INVISIBLE, - MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN, - MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP, - MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, - MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, -}; - -enum -{ - MOVEMENT_ACTION_FACE_DOWN, - MOVEMENT_ACTION_FACE_UP, - MOVEMENT_ACTION_FACE_LEFT, - MOVEMENT_ACTION_FACE_RIGHT, - MOVEMENT_ACTION_WALK_SLOW_DOWN, - MOVEMENT_ACTION_WALK_SLOW_UP, - MOVEMENT_ACTION_WALK_SLOW_LEFT, - MOVEMENT_ACTION_WALK_SLOW_RIGHT, - MOVEMENT_ACTION_WALK_NORMAL_DOWN, - MOVEMENT_ACTION_WALK_NORMAL_UP, - MOVEMENT_ACTION_WALK_NORMAL_LEFT, - MOVEMENT_ACTION_WALK_NORMAL_RIGHT, - MOVEMENT_ACTION_JUMP_2_DOWN, - MOVEMENT_ACTION_JUMP_2_UP, - MOVEMENT_ACTION_JUMP_2_LEFT, - MOVEMENT_ACTION_JUMP_2_RIGHT, - MOVEMENT_ACTION_DELAY_1, - MOVEMENT_ACTION_DELAY_2, - MOVEMENT_ACTION_DELAY_4, - MOVEMENT_ACTION_DELAY_8, - MOVEMENT_ACTION_DELAY_16, - MOVEMENT_ACTION_WALK_FAST_DOWN, - MOVEMENT_ACTION_WALK_FAST_UP, - MOVEMENT_ACTION_WALK_FAST_LEFT, - MOVEMENT_ACTION_WALK_FAST_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT, - MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT, - MOVEMENT_ACTION_WALK_FASTEST_DOWN, - MOVEMENT_ACTION_WALK_FASTEST_UP, - MOVEMENT_ACTION_WALK_FASTEST_LEFT, - MOVEMENT_ACTION_WALK_FASTEST_RIGHT, - MOVEMENT_ACTION_SLIDE_DOWN, - MOVEMENT_ACTION_SLIDE_UP, - MOVEMENT_ACTION_SLIDE_LEFT, - MOVEMENT_ACTION_SLIDE_RIGHT, - MOVEMENT_ACTION_PLAYER_RUN_DOWN, - MOVEMENT_ACTION_PLAYER_RUN_UP, - MOVEMENT_ACTION_PLAYER_RUN_LEFT, - MOVEMENT_ACTION_PLAYER_RUN_RIGHT, - MOVEMENT_ACTION_START_ANIM_IN_DIRECTION, - MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, - MOVEMENT_ACTION_JUMP_SPECIAL_UP, - MOVEMENT_ACTION_JUMP_SPECIAL_LEFT, - MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT, - MOVEMENT_ACTION_FACE_PLAYER, - MOVEMENT_ACTION_FACE_AWAY_PLAYER, - MOVEMENT_ACTION_LOCK_FACING_DIRECTION, - MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION, - MOVEMENT_ACTION_JUMP_DOWN, - MOVEMENT_ACTION_JUMP_UP, - MOVEMENT_ACTION_JUMP_LEFT, - MOVEMENT_ACTION_JUMP_RIGHT, - MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, - MOVEMENT_ACTION_JUMP_IN_PLACE_UP, - MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT, - MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT, - MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP, - MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, - MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT, - MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT, - MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION, - MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN, - MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT, - MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT, - MOVEMENT_ACTION_DISABLE_ANIMATION, - MOVEMENT_ACTION_RESTORE_ANIMATION, - MOVEMENT_ACTION_SET_INVISIBLE, - MOVEMENT_ACTION_SET_VISIBLE, - MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK, - MOVEMENT_ACTION_EMOTE_QUESTION_MARK, - MOVEMENT_ACTION_EMOTE_HEART, - MOVEMENT_ACTION_REVEAL_TRAINER, - MOVEMENT_ACTION_ROCK_SMASH_BREAK, - MOVEMENT_ACTION_CUT_TREE, - MOVEMENT_ACTION_SET_FIXED_PRIORITY, - MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY, - MOVEMENT_ACTION_INIT_AFFINE_ANIM, - MOVEMENT_ACTION_CLEAR_AFFINE_ANIM, - MOVEMENT_ACTION_UNKNOWN1, - MOVEMENT_ACTION_UNKNOWN2, - MOVEMENT_ACTION_WALK_DOWN_START_AFFINE, - MOVEMENT_ACTION_WALK_DOWN_AFFINE, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT, - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT, - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT, - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT, - MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT, - MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT, - MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT, - MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT, - MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT, - MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT, - MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT, - MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT, - MOVEMENT_ACTION_STORE_AND_LOCK_ANIM, - MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM, - MOVEMENT_ACTION_WALK_LEFT_AFFINE, - MOVEMENT_ACTION_WALK_RIGHT_AFFINE, - MOVEMENT_ACTION_LEVITATE, - MOVEMENT_ACTION_STOP_LEVITATE, - MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP, - MOVEMENT_ACTION_FIGURE_8, - MOVEMENT_ACTION_FLY_UP, - MOVEMENT_ACTION_FLY_DOWN, -}; - enum SpinnerRunnerFollowPatterns { RUNFOLLOW_ANY, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 35b04ea1e..953851108 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -21,6 +21,7 @@ #include "sprite.h" #include "trainer_see.h" #include "util.h" +#include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" // this file was known as evobjmv.c in Game Freak's original source -- cgit v1.2.3 From 8ffd7a70fc6d059f04a0588d2956d4f02f7eeb5d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 10 Jul 2018 18:04:51 -0500 Subject: Use movement type constants in object_event macros --- data/map_events.s | 1 + data/maps/AbandonedShip_CaptainsOffice/events.inc | 4 +- data/maps/AbandonedShip_Corridors_1F/events.inc | 4 +- data/maps/AbandonedShip_Corridors_B1F/events.inc | 4 +- .../maps/AbandonedShip_HiddenFloorRooms/events.inc | 8 +- data/maps/AbandonedShip_Room_B1F/events.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/events.inc | 10 +-- data/maps/AbandonedShip_Rooms2_B1F/events.inc | 4 +- data/maps/AbandonedShip_Rooms_1F/events.inc | 8 +- data/maps/AbandonedShip_Rooms_B1F/events.inc | 4 +- data/maps/AncientTomb/events.inc | 2 +- data/maps/AquaHideout_1F/events.inc | 6 +- data/maps/AquaHideout_B1F/events.inc | 18 ++--- data/maps/AquaHideout_B2F/events.inc | 12 +-- data/maps/ArtisanCave_1F/events.inc | 2 +- data/maps/ArtisanCave_B1F/events.inc | 2 +- .../events.inc | 18 ++--- .../BattleFrontier_BattleArenaCorridor/events.inc | 2 +- .../BattleFrontier_BattleArenaLobby/events.inc | 10 +-- .../BattleFrontier_BattleDomeBattleRoom/events.inc | 30 +++---- .../BattleFrontier_BattleDomeCorridor/events.inc | 2 +- .../maps/BattleFrontier_BattleDomeLobby/events.inc | 12 +-- .../events.inc | 2 +- .../events.inc | 16 ++-- .../BattleFrontier_BattleFactoryLobby/events.inc | 12 +-- .../events.inc | 2 +- .../events.inc | 10 +-- .../BattleFrontier_BattlePalaceCorridor/events.inc | 14 ++-- .../BattleFrontier_BattlePalaceLobby/events.inc | 12 +-- .../BattleFrontier_BattlePikeCorridor/events.inc | 2 +- .../maps/BattleFrontier_BattlePikeLobby/events.inc | 8 +- .../events.inc | 4 +- .../events.inc | 2 +- .../events.inc | 4 +- .../events.inc | 18 ++--- .../events.inc | 32 ++++---- .../BattleFrontier_BattlePyramidLobby/events.inc | 8 +- .../BattleFrontier_BattlePyramidTop/events.inc | 4 +- .../events.inc | 6 +- .../events.inc | 12 +-- .../BattleFrontier_BattleTowerCorridor/events.inc | 2 +- .../BattleFrontier_BattleTowerCorridor2/events.inc | 8 +- .../BattleFrontier_BattleTowerElevator/events.inc | 2 +- .../BattleFrontier_BattleTowerLobby/events.inc | 18 ++--- .../events.inc | 18 ++--- data/maps/BattleFrontier_Lounge1/events.inc | 6 +- data/maps/BattleFrontier_Lounge2/events.inc | 10 +-- data/maps/BattleFrontier_Lounge3/events.inc | 10 +-- data/maps/BattleFrontier_Lounge4/events.inc | 6 +- data/maps/BattleFrontier_Lounge5/events.inc | 8 +- data/maps/BattleFrontier_Lounge6/events.inc | 2 +- data/maps/BattleFrontier_Lounge7/events.inc | 8 +- data/maps/BattleFrontier_Lounge8/events.inc | 6 +- data/maps/BattleFrontier_Lounge9/events.inc | 2 +- data/maps/BattleFrontier_Mart/events.inc | 8 +- data/maps/BattleFrontier_OutsideEast/events.inc | 52 ++++++------ data/maps/BattleFrontier_OutsideWest/events.inc | 48 +++++------ .../BattleFrontier_PokemonCenter_1F/events.inc | 10 +-- .../BattleFrontier_PokemonCenter_2F/events.inc | 8 +- data/maps/BattleFrontier_RankingHall/events.inc | 6 +- data/maps/BattleFrontier_ReceptionGate/events.inc | 10 +-- data/maps/BattleFrontier_ScottsHouse/events.inc | 2 +- data/maps/BattlePyramidSquare01/events.inc | 14 ++-- data/maps/BattlePyramidSquare02/events.inc | 14 ++-- data/maps/BattlePyramidSquare03/events.inc | 14 ++-- data/maps/BattlePyramidSquare04/events.inc | 14 ++-- data/maps/BattlePyramidSquare05/events.inc | 14 ++-- data/maps/BattlePyramidSquare06/events.inc | 14 ++-- data/maps/BattlePyramidSquare07/events.inc | 14 ++-- data/maps/BattlePyramidSquare08/events.inc | 14 ++-- data/maps/BattlePyramidSquare09/events.inc | 14 ++-- data/maps/BattlePyramidSquare10/events.inc | 14 ++-- data/maps/BattlePyramidSquare11/events.inc | 14 ++-- data/maps/BattlePyramidSquare12/events.inc | 14 ++-- data/maps/BattlePyramidSquare13/events.inc | 14 ++-- data/maps/BattlePyramidSquare14/events.inc | 14 ++-- data/maps/BattlePyramidSquare15/events.inc | 14 ++-- data/maps/BattlePyramidSquare16/events.inc | 14 ++-- data/maps/BirthIsland_Exterior/events.inc | 4 +- data/maps/BirthIsland_Harbor/events.inc | 4 +- data/maps/CaveOfOrigin_B1F/events.inc | 2 +- data/maps/DesertRuins/events.inc | 2 +- data/maps/DesertUnderpass/events.inc | 2 +- data/maps/DewfordTown/events.inc | 10 +-- data/maps/DewfordTown_Gym/events.inc | 16 ++-- data/maps/DewfordTown_Hall/events.inc | 18 ++--- data/maps/DewfordTown_House1/events.inc | 6 +- data/maps/DewfordTown_House2/events.inc | 4 +- data/maps/DewfordTown_PokemonCenter_1F/events.inc | 6 +- data/maps/DewfordTown_PokemonCenter_2F/events.inc | 8 +- data/maps/EverGrandeCity_ChampionsRoom/events.inc | 6 +- data/maps/EverGrandeCity_DrakesRoom/events.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/events.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/events.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/events.inc | 2 +- .../EverGrandeCity_PokemonCenter_1F/events.inc | 8 +- .../EverGrandeCity_PokemonCenter_2F/events.inc | 8 +- .../EverGrandeCity_PokemonLeague_1F/events.inc | 8 +- .../EverGrandeCity_PokemonLeague_2F/events.inc | 8 +- data/maps/EverGrandeCity_SidneysRoom/events.inc | 2 +- data/maps/FallarborTown/events.inc | 8 +- .../FallarborTown_BattleTentBattleRoom/events.inc | 6 +- .../FallarborTown_BattleTentCorridor/events.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/events.inc | 10 +-- data/maps/FallarborTown_House1/events.inc | 4 +- data/maps/FallarborTown_House2/events.inc | 2 +- data/maps/FallarborTown_Mart/events.inc | 10 +-- .../maps/FallarborTown_PokemonCenter_1F/events.inc | 8 +- .../maps/FallarborTown_PokemonCenter_2F/events.inc | 8 +- data/maps/FarawayIsland_Entrance/events.inc | 4 +- data/maps/FarawayIsland_Interior/events.inc | 2 +- data/maps/FieryPath/events.inc | 16 ++-- data/maps/FortreeCity/events.inc | 14 ++-- data/maps/FortreeCity_DecorationShop/events.inc | 8 +- data/maps/FortreeCity_Gym/events.inc | 16 ++-- data/maps/FortreeCity_House1/events.inc | 6 +- data/maps/FortreeCity_House2/events.inc | 4 +- data/maps/FortreeCity_House3/events.inc | 4 +- data/maps/FortreeCity_House4/events.inc | 6 +- data/maps/FortreeCity_House5/events.inc | 6 +- data/maps/FortreeCity_Mart/events.inc | 8 +- data/maps/FortreeCity_PokemonCenter_1F/events.inc | 8 +- data/maps/FortreeCity_PokemonCenter_2F/events.inc | 8 +- data/maps/GraniteCave_1F/events.inc | 4 +- data/maps/GraniteCave_B1F/events.inc | 2 +- data/maps/GraniteCave_B2F/events.inc | 18 ++--- data/maps/GraniteCave_StevensRoom/events.inc | 2 +- data/maps/InsideOfTruck/events.inc | 6 +- data/maps/IslandCave/events.inc | 2 +- data/maps/JaggedPass/events.inc | 14 ++-- data/maps/LavaridgeTown/events.inc | 18 ++--- data/maps/LavaridgeTown_Gym_1F/events.inc | 12 +-- data/maps/LavaridgeTown_Gym_B1F/events.inc | 8 +- data/maps/LavaridgeTown_HerbShop/events.inc | 6 +- data/maps/LavaridgeTown_House/events.inc | 6 +- data/maps/LavaridgeTown_Mart/events.inc | 6 +- .../maps/LavaridgeTown_PokemonCenter_1F/events.inc | 8 +- .../maps/LavaridgeTown_PokemonCenter_2F/events.inc | 8 +- data/maps/LilycoveCity/events.inc | 44 +++++------ data/maps/LilycoveCity_ContestHall/events.inc | 64 +++++++-------- data/maps/LilycoveCity_ContestLobby/events.inc | 50 ++++++------ data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc | 14 ++-- .../events.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/events.inc | 8 +- .../LilycoveCity_DepartmentStore_1F/events.inc | 12 +-- .../LilycoveCity_DepartmentStore_2F/events.inc | 10 +-- .../LilycoveCity_DepartmentStore_3F/events.inc | 10 +-- .../LilycoveCity_DepartmentStore_4F/events.inc | 10 +-- .../LilycoveCity_DepartmentStore_5F/events.inc | 14 ++-- data/maps/LilycoveCity_Harbor/events.inc | 10 +-- data/maps/LilycoveCity_House1/events.inc | 4 +- data/maps/LilycoveCity_House2/events.inc | 2 +- data/maps/LilycoveCity_House3/events.inc | 12 +-- data/maps/LilycoveCity_House4/events.inc | 4 +- .../maps/LilycoveCity_LilycoveMuseum_1F/events.inc | 20 ++--- .../maps/LilycoveCity_LilycoveMuseum_2F/events.inc | 8 +- .../maps/LilycoveCity_MoveDeletersHouse/events.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/events.inc | 10 +-- data/maps/LilycoveCity_PokemonCenter_2F/events.inc | 8 +- .../LilycoveCity_PokemonTrainerFanClub/events.inc | 18 ++--- data/maps/LinkContestRoom1/events.inc | 30 +++---- data/maps/LittlerootTown/events.inc | 16 ++-- .../LittlerootTown_BrendansHouse_1F/events.inc | 14 ++-- .../LittlerootTown_BrendansHouse_2F/events.inc | 32 ++++---- data/maps/LittlerootTown_MaysHouse_1F/events.inc | 14 ++-- data/maps/LittlerootTown_MaysHouse_2F/events.inc | 32 ++++---- .../LittlerootTown_ProfessorBirchsLab/events.inc | 12 +-- data/maps/MagmaHideout_1F/events.inc | 12 +-- data/maps/MagmaHideout_2F_1R/events.inc | 8 +- data/maps/MagmaHideout_2F_2R/events.inc | 12 +-- data/maps/MagmaHideout_3F_1R/events.inc | 6 +- data/maps/MagmaHideout_3F_2R/events.inc | 4 +- data/maps/MagmaHideout_3F_3R/events.inc | 2 +- data/maps/MagmaHideout_4F/events.inc | 16 ++-- data/maps/MarineCave_End/events.inc | 2 +- data/maps/MauvilleCity/events.inc | 22 +++--- data/maps/MauvilleCity_BikeShop/events.inc | 4 +- data/maps/MauvilleCity_GameCorner/events.inc | 24 +++--- data/maps/MauvilleCity_Gym/events.inc | 14 ++-- data/maps/MauvilleCity_House1/events.inc | 2 +- data/maps/MauvilleCity_House2/events.inc | 2 +- data/maps/MauvilleCity_Mart/events.inc | 6 +- data/maps/MauvilleCity_PokemonCenter_1F/events.inc | 10 +-- data/maps/MauvilleCity_PokemonCenter_2F/events.inc | 10 +-- data/maps/MeteorFalls_1F_1R/events.inc | 20 ++--- data/maps/MeteorFalls_1F_2R/events.inc | 6 +- data/maps/MeteorFalls_B1F_2R/events.inc | 2 +- data/maps/MeteorFalls_StevensCave/events.inc | 2 +- data/maps/MirageTower_3F/events.inc | 4 +- data/maps/MirageTower_4F/events.inc | 6 +- data/maps/MossdeepCity/events.inc | 34 ++++---- data/maps/MossdeepCity_GameCorner_1F/events.inc | 4 +- data/maps/MossdeepCity_GameCorner_B1F/events.inc | 2 +- data/maps/MossdeepCity_Gym/events.inc | 72 ++++++++--------- data/maps/MossdeepCity_House1/events.inc | 4 +- data/maps/MossdeepCity_House2/events.inc | 6 +- data/maps/MossdeepCity_House3/events.inc | 2 +- data/maps/MossdeepCity_House4/events.inc | 6 +- data/maps/MossdeepCity_Mart/events.inc | 8 +- data/maps/MossdeepCity_PokemonCenter_1F/events.inc | 6 +- data/maps/MossdeepCity_PokemonCenter_2F/events.inc | 10 +-- data/maps/MossdeepCity_SpaceCenter_1F/events.inc | 22 +++--- data/maps/MossdeepCity_SpaceCenter_2F/events.inc | 18 ++--- data/maps/MossdeepCity_StevensHouse/events.inc | 6 +- data/maps/MtChimney/events.inc | 60 +++++++------- data/maps/MtChimney_CableCarStation/events.inc | 4 +- data/maps/MtPyre_1F/events.inc | 6 +- data/maps/MtPyre_2F/events.inc | 16 ++-- data/maps/MtPyre_3F/events.inc | 8 +- data/maps/MtPyre_4F/events.inc | 4 +- data/maps/MtPyre_5F/events.inc | 4 +- data/maps/MtPyre_6F/events.inc | 6 +- data/maps/MtPyre_Exterior/events.inc | 4 +- data/maps/MtPyre_Summit/events.inc | 16 ++-- data/maps/NavelRock_Bottom/events.inc | 2 +- data/maps/NavelRock_Harbor/events.inc | 4 +- data/maps/NavelRock_Top/events.inc | 2 +- data/maps/NewMauville_Inside/events.inc | 16 ++-- data/maps/OldaleTown/events.inc | 8 +- data/maps/OldaleTown_House1/events.inc | 2 +- data/maps/OldaleTown_House2/events.inc | 4 +- data/maps/OldaleTown_Mart/events.inc | 6 +- data/maps/OldaleTown_PokemonCenter_1F/events.inc | 8 +- data/maps/OldaleTown_PokemonCenter_2F/events.inc | 8 +- data/maps/PacifidlogTown/events.inc | 6 +- data/maps/PacifidlogTown_House1/events.inc | 4 +- data/maps/PacifidlogTown_House2/events.inc | 6 +- data/maps/PacifidlogTown_House3/events.inc | 4 +- data/maps/PacifidlogTown_House4/events.inc | 6 +- data/maps/PacifidlogTown_House5/events.inc | 4 +- .../PacifidlogTown_PokemonCenter_1F/events.inc | 10 +-- .../PacifidlogTown_PokemonCenter_2F/events.inc | 8 +- data/maps/PetalburgCity/events.inc | 18 ++--- data/maps/PetalburgCity_Gym/events.inc | 22 +++--- data/maps/PetalburgCity_House1/events.inc | 4 +- data/maps/PetalburgCity_House2/events.inc | 4 +- data/maps/PetalburgCity_Mart/events.inc | 8 +- .../maps/PetalburgCity_PokemonCenter_1F/events.inc | 10 +-- .../maps/PetalburgCity_PokemonCenter_2F/events.inc | 8 +- data/maps/PetalburgCity_WallysHouse/events.inc | 4 +- data/maps/PetalburgWoods/events.inc | 26 +++--- data/maps/RecordCorner/events.inc | 2 +- data/maps/Route101/events.inc | 12 +-- data/maps/Route102/events.inc | 18 ++--- data/maps/Route103/events.inc | 40 +++++----- data/maps/Route104/events.inc | 68 ++++++++-------- data/maps/Route104_MrBrineysHouse/events.inc | 4 +- .../maps/Route104_PrettyPetalFlowerShop/events.inc | 6 +- data/maps/Route105/events.inc | 16 ++-- data/maps/Route106/events.inc | 10 +-- data/maps/Route107/events.inc | 14 ++-- data/maps/Route108/events.inc | 14 ++-- data/maps/Route109/events.inc | 48 +++++------ data/maps/Route109_SeashoreHouse/events.inc | 8 +- data/maps/Route110/events.inc | 72 ++++++++--------- .../events.inc | 2 +- .../events.inc | 2 +- data/maps/Route110_TrickHouseEnd/events.inc | 2 +- data/maps/Route110_TrickHouseEntrance/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/events.inc | 30 +++---- data/maps/Route110_TrickHousePuzzle2/events.inc | 10 +-- data/maps/Route110_TrickHousePuzzle3/events.inc | 14 ++-- data/maps/Route110_TrickHousePuzzle4/events.inc | 28 +++---- data/maps/Route110_TrickHousePuzzle5/events.inc | 10 +-- data/maps/Route110_TrickHousePuzzle6/events.inc | 8 +- data/maps/Route110_TrickHousePuzzle7/events.inc | 18 ++--- data/maps/Route110_TrickHousePuzzle8/events.inc | 8 +- data/maps/Route111/events.inc | 92 +++++++++++----------- data/maps/Route111_OldLadysRestStop/events.inc | 2 +- .../maps/Route111_WinstrateFamilysHouse/events.inc | 8 +- data/maps/Route112/events.inc | 28 +++---- data/maps/Route112_CableCarStation/events.inc | 4 +- data/maps/Route113/events.inc | 32 ++++---- data/maps/Route113_GlassWorkshop/events.inc | 4 +- data/maps/Route114/events.inc | 54 ++++++------- data/maps/Route114_FossilManiacsHouse/events.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/events.inc | 2 +- data/maps/Route114_LanettesHouse/events.inc | 2 +- data/maps/Route115/events.inc | 46 +++++------ data/maps/Route116/events.inc | 56 ++++++------- data/maps/Route116_TunnelersRestHouse/events.inc | 6 +- data/maps/Route117/events.inc | 48 +++++------ data/maps/Route117_PokemonDayCare/events.inc | 2 +- data/maps/Route118/events.inc | 42 +++++----- data/maps/Route119/events.inc | 86 ++++++++++---------- data/maps/Route119_House/events.inc | 14 ++-- data/maps/Route119_WeatherInstitute_1F/events.inc | 10 +-- data/maps/Route119_WeatherInstitute_2F/events.inc | 16 ++-- data/maps/Route120/events.inc | 88 ++++++++++----------- data/maps/Route121/events.inc | 58 +++++++------- data/maps/Route121_SafariZoneEntrance/events.inc | 6 +- data/maps/Route123/events.inc | 86 ++++++++++---------- data/maps/Route123_BerryMastersHouse/events.inc | 4 +- data/maps/Route124/events.inc | 24 +++--- .../Route124_DivingTreasureHuntersHouse/events.inc | 2 +- data/maps/Route125/events.inc | 20 ++--- data/maps/Route126/events.inc | 18 ++--- data/maps/Route127/events.inc | 22 +++--- data/maps/Route128/events.inc | 20 ++--- data/maps/Route129/events.inc | 10 +-- data/maps/Route130/events.inc | 8 +- data/maps/Route131/events.inc | 16 ++-- data/maps/Route132/events.inc | 20 ++--- data/maps/Route133/events.inc | 20 ++--- data/maps/Route134/events.inc | 22 +++--- data/maps/RustboroCity/events.inc | 32 ++++---- data/maps/RustboroCity_CuttersHouse/events.inc | 4 +- data/maps/RustboroCity_DevonCorp_1F/events.inc | 6 +- data/maps/RustboroCity_DevonCorp_2F/events.inc | 12 +-- data/maps/RustboroCity_DevonCorp_3F/events.inc | 6 +- data/maps/RustboroCity_Flat1_1F/events.inc | 4 +- data/maps/RustboroCity_Flat1_2F/events.inc | 16 ++-- data/maps/RustboroCity_Flat2_1F/events.inc | 4 +- data/maps/RustboroCity_Flat2_2F/events.inc | 4 +- data/maps/RustboroCity_Flat2_3F/events.inc | 4 +- data/maps/RustboroCity_Gym/events.inc | 10 +-- data/maps/RustboroCity_House1/events.inc | 4 +- data/maps/RustboroCity_House2/events.inc | 4 +- data/maps/RustboroCity_House3/events.inc | 6 +- data/maps/RustboroCity_Mart/events.inc | 8 +- data/maps/RustboroCity_PokemonCenter_1F/events.inc | 8 +- data/maps/RustboroCity_PokemonCenter_2F/events.inc | 8 +- data/maps/RustboroCity_PokemonSchool/events.inc | 14 ++-- data/maps/RusturfTunnel/events.inc | 20 ++--- data/maps/SSTidalCorridor/events.inc | 10 +-- data/maps/SSTidalLowerDeck/events.inc | 4 +- data/maps/SSTidalRooms/events.inc | 16 ++-- data/maps/SafariZone_North/events.inc | 18 ++--- data/maps/SafariZone_Northeast/events.inc | 18 ++--- data/maps/SafariZone_Northwest/events.inc | 4 +- data/maps/SafariZone_RestHouse/events.inc | 6 +- data/maps/SafariZone_South/events.inc | 12 +-- data/maps/SafariZone_Southeast/events.inc | 10 +-- data/maps/SafariZone_Southwest/events.inc | 4 +- data/maps/ScorchedSlab/events.inc | 2 +- data/maps/SeafloorCavern_Entrance/events.inc | 2 +- data/maps/SeafloorCavern_Room1/events.inc | 10 +-- data/maps/SeafloorCavern_Room2/events.inc | 16 ++-- data/maps/SeafloorCavern_Room3/events.inc | 18 ++--- data/maps/SeafloorCavern_Room4/events.inc | 4 +- data/maps/SeafloorCavern_Room5/events.inc | 12 +-- data/maps/SeafloorCavern_Room8/events.inc | 24 +++--- data/maps/SeafloorCavern_Room9/events.inc | 14 ++-- data/maps/SecretBase_BlueCave1/events.inc | 30 +++---- data/maps/SecretBase_BlueCave2/events.inc | 30 +++---- data/maps/SecretBase_BlueCave3/events.inc | 30 +++---- data/maps/SecretBase_BlueCave4/events.inc | 30 +++---- data/maps/SecretBase_BrownCave1/events.inc | 30 +++---- data/maps/SecretBase_BrownCave2/events.inc | 30 +++---- data/maps/SecretBase_BrownCave3/events.inc | 30 +++---- data/maps/SecretBase_BrownCave4/events.inc | 30 +++---- data/maps/SecretBase_RedCave1/events.inc | 30 +++---- data/maps/SecretBase_RedCave2/events.inc | 30 +++---- data/maps/SecretBase_RedCave3/events.inc | 30 +++---- data/maps/SecretBase_RedCave4/events.inc | 30 +++---- data/maps/SecretBase_Shrub1/events.inc | 30 +++---- data/maps/SecretBase_Shrub2/events.inc | 30 +++---- data/maps/SecretBase_Shrub3/events.inc | 30 +++---- data/maps/SecretBase_Shrub4/events.inc | 30 +++---- data/maps/SecretBase_Tree1/events.inc | 30 +++---- data/maps/SecretBase_Tree2/events.inc | 30 +++---- data/maps/SecretBase_Tree3/events.inc | 30 +++---- data/maps/SecretBase_Tree4/events.inc | 30 +++---- data/maps/SecretBase_YellowCave1/events.inc | 30 +++---- data/maps/SecretBase_YellowCave2/events.inc | 30 +++---- data/maps/SecretBase_YellowCave3/events.inc | 30 +++---- data/maps/SecretBase_YellowCave4/events.inc | 30 +++---- data/maps/ShoalCave_LowTideEntranceRoom/events.inc | 4 +- data/maps/ShoalCave_LowTideIceRoom/events.inc | 4 +- data/maps/ShoalCave_LowTideInnerRoom/events.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/events.inc | 4 +- data/maps/ShoalCave_LowTideStairsRoom/events.inc | 2 +- data/maps/SingleBattleColosseum/events.inc | 2 +- data/maps/SkyPillar_Outside/events.inc | 2 +- data/maps/SkyPillar_Top/events.inc | 4 +- data/maps/SlateportCity/events.inc | 70 ++++++++-------- .../SlateportCity_BattleTentBattleRoom/events.inc | 6 +- .../SlateportCity_BattleTentCorridor/events.inc | 2 +- data/maps/SlateportCity_BattleTentLobby/events.inc | 10 +-- data/maps/SlateportCity_Harbor/events.inc | 16 ++-- data/maps/SlateportCity_House1/events.inc | 2 +- data/maps/SlateportCity_House2/events.inc | 4 +- data/maps/SlateportCity_Mart/events.inc | 6 +- .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 28 +++---- .../maps/SlateportCity_OceanicMuseum_2F/events.inc | 14 ++-- .../maps/SlateportCity_PokemonCenter_1F/events.inc | 6 +- .../maps/SlateportCity_PokemonCenter_2F/events.inc | 8 +- data/maps/SlateportCity_PokemonFanClub/events.inc | 18 ++--- .../SlateportCity_SternsShipyard_1F/events.inc | 8 +- .../SlateportCity_SternsShipyard_2F/events.inc | 6 +- data/maps/SootopolisCity/events.inc | 36 ++++----- data/maps/SootopolisCity_Gym_1F/events.inc | 4 +- data/maps/SootopolisCity_Gym_B1F/events.inc | 20 ++--- data/maps/SootopolisCity_House1/events.inc | 4 +- data/maps/SootopolisCity_House2/events.inc | 2 +- data/maps/SootopolisCity_House3/events.inc | 4 +- data/maps/SootopolisCity_House4/events.inc | 6 +- data/maps/SootopolisCity_House5/events.inc | 4 +- data/maps/SootopolisCity_House6/events.inc | 2 +- data/maps/SootopolisCity_House7/events.inc | 4 +- .../SootopolisCity_LotadAndSeedotHouse/events.inc | 4 +- data/maps/SootopolisCity_Mart/events.inc | 6 +- .../events.inc | 2 +- .../events.inc | 2 +- .../SootopolisCity_PokemonCenter_1F/events.inc | 8 +- .../SootopolisCity_PokemonCenter_2F/events.inc | 8 +- data/maps/SouthernIsland_Exterior/events.inc | 4 +- data/maps/SouthernIsland_Interior/events.inc | 4 +- data/maps/TerraCave_End/events.inc | 2 +- data/maps/TradeCenter/events.inc | 2 +- data/maps/TrainerHill_Elevator/events.inc | 2 +- data/maps/TrainerHill_Entrance/events.inc | 10 +-- data/maps/TrainerHill_Roof/events.inc | 2 +- data/maps/Underwater_SeafloorCavern/events.inc | 8 +- data/maps/UnionRoom/events.inc | 18 ++--- data/maps/VerdanturfTown/events.inc | 8 +- .../VerdanturfTown_BattleTentBattleRoom/events.inc | 6 +- .../VerdanturfTown_BattleTentCorridor/events.inc | 2 +- .../maps/VerdanturfTown_BattleTentLobby/events.inc | 12 +-- .../events.inc | 4 +- data/maps/VerdanturfTown_House/events.inc | 4 +- data/maps/VerdanturfTown_Mart/events.inc | 8 +- .../VerdanturfTown_PokemonCenter_1F/events.inc | 8 +- .../VerdanturfTown_PokemonCenter_2F/events.inc | 8 +- data/maps/VerdanturfTown_WandasHouse/events.inc | 10 +-- data/maps/VictoryRoad_1F/events.inc | 18 ++--- data/maps/VictoryRoad_B1F/events.inc | 42 +++++----- data/maps/VictoryRoad_B2F/events.inc | 14 ++-- 429 files changed, 2777 insertions(+), 2776 deletions(-) diff --git a/data/map_events.s b/data/map_events.s index 4fcfb5979..d268cba63 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,3 +1,4 @@ +#include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc index e7e48568c..dfe6d84e0 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -1,6 +1,6 @@ AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100 + 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, 1100 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc index f0e276032..665350915 100644 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 + 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 warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index d1ee69499..d3b72825e 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 + 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 warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index e352635a5..3c9cb9a0d 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -1,8 +1,8 @@ AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc index 1f1cab59a..f3a1d3327 100644 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F_EventObjects: @ 853697C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098 + 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, 1098 AbandonedShip_Room_B1F_MapWarps: @ 8536994 warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc index 7dfb4d059..50debde1b 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -1,9 +1,9 @@ AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, 10, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 - object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, 9, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 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_5, 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, 1099 + 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 warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc index 40e4600af..05d48a618 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097 + 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, 1097 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc index 072892b0a..3b6fc136e 100644 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -1,8 +1,8 @@ AbandonedShip_Rooms_1F_EventObjects: @ 8536764 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, 8, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, 16, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 + 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, 1095 + 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 warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc index 50bc7c0ee..97a8aa246 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096 + 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, 1096 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 4950be4ac..8008e9d5c 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -1,5 +1,5 @@ AncientTomb_EventObjects: @ 8536CDC - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937 + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937 AncientTomb_MapWarps: @ 8536CF4 warp_def 8, 29, 3, 0, MAP_ROUTE120 diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc index 7d0befd16..ab7c49b30 100644 --- a/data/maps/AquaHideout_1F/events.inc +++ b/data/maps/AquaHideout_1F/events.inc @@ -1,7 +1,7 @@ AquaHideout_1F_EventObjects: @ 8535304 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924 + 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, 821 + 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, 822 + 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, 924 AquaHideout_1F_MapWarps: @ 853534C warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc index 31108fa9c..bbada49f8 100644 --- a/data/maps/AquaHideout_B1F/events.inc +++ b/data/maps/AquaHideout_B1F/events.inc @@ -1,13 +1,13 @@ AquaHideout_B1F_EventObjects: @ 8535378 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, 7, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924 + 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, 924 + 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, 924 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071 + 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, 924 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978 + 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, 924 AquaHideout_B1F_MapWarps: @ 8535450 warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index eca22f5f7..628ff1158 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -1,10 +1,10 @@ AquaHideout_B2F_EventObjects: @ 853552C - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, 10, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, 9, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924 + 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, 924 + 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, 924 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 943 + 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, 924 + 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, 924 AquaHideout_B2F_MapWarps: @ 85355BC warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc index edd7429a3..7f7405a55 100644 --- a/data/maps/ArtisanCave_1F/events.inc +++ b/data/maps/ArtisanCave_1F/events.inc @@ -1,5 +1,5 @@ ArtisanCave_1F_EventObjects: @ 8537774 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163 ArtisanCave_1F_MapWarps: @ 853778C warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc index a0b96c316..4294d60dd 100644 --- a/data/maps/ArtisanCave_B1F/events.inc +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F_EventObjects: @ 8537708 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, 1, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162 ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc index ce6eeb952..1a8216287 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, 10, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, 9, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, 9, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, 10, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 8, 1, 1, 0, 0, 0x0, 0 + 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_HIPSTER, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_TRADER, 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 map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc index 03a2cb14d..bfe28c339 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, 8, 1, 1, 0, 0, 0x0, 0 + 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 map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc index d0343228b..4b8e0de0d 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc @@ -1,9 +1,9 @@ BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 + 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_7, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 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 warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc index 2500a826b..d33a3103c 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc @@ -1,19 +1,19 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 - object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, 7, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, 9, 1, 1, 0, 0, 0x0, 0 + 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_LITTLE_GIRL_1, 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_LITTLE_BOY_1, 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_OLD_MAN_1, 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_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc index 8a8d5448e..6bce917a0 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, 8, 1, 1, 0, 0, 0x0, 0 + 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 warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc index 9c6eb2649..4cd125033 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 + 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_4, 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: @ 853C0F8 warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc index 7f2133ac5..559199b29 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 1, 1, 0, 0, 0x0, 0 + 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 warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc index 2ea1fbd41..264c7d731 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc @@ -1,12 +1,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 8, 255, 0, 5, 11, 0, 7, 1, 1, 0, 0, 0x0, 0 + 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_HIPSTER, 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, 255, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc index 13de4c539..dd7b4029d 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0 - object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, 1, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 + 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: @ 853CA68 warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc index b8ffbfc6d..d341250de 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, 7, 1, 1, 0, 0, 0x0, 0 + 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 map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc index bc1d5a525..4c84a209f 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc @@ -1,9 +1,9 @@ BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, 10, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 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 warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc index f6baf26f6..bf06dcf34 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc @@ -1,11 +1,11 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, 14, 0, 2, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, 14, 0, 2, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, 1, 0, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, 2, 1, 2, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 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: @ 853C4C8 warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc index 56da378cb..c53e0f875 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc @@ -1,10 +1,10 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 - object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 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_4, 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_OLD_MAN_1, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc index 67ceaaae6..8734e4dc8 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc index 45d3da103..5fddc6f37 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, 7, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, 9, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 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_LITTLE_GIRL_1, 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 warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc index 80c1fc3bf..07c2866a1 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 - object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc index 9cff20517..3ce444a53 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc index 7a23ba892..a04f0cf4e 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc index 7a8c584ac..2945034bc 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc @@ -1,13 +1,13 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 - object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 + 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_BOY_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 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_6, 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: @ 853D0F0 warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc index f7d22a5ed..3e66eec7d 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc @@ -1,20 +1,20 @@ BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, 1, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 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:: @ 853C7AC map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc index 28b5f5c61..dd3722945 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, 8, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 - object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, 9, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 + 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_4, 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 warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc index f724f4f9f..a42052d96 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, 8, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 - object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, 7, 1, 1, 0, 0, 0x0, 0 + 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 coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc index 0bc8d0434..55aed13a4 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 + 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 warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc index f97d8ad0c..505a903da 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc @@ -1,10 +1,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888 - object_event 5, 255, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 6, 254, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 + 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_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888 + object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc index 23f3377f3..ae3ca2575 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0 + 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 map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc index 9dce5da52..8f6a1e2f0 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 - object_event 1, 255, 0, 1, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 4, 254, 0, 14, 1, 0, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, 255, 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, 254, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc index 321fc90e3..671d6d434 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/events.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/events.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0 + 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 map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc index 86e159b63..ef38d131b 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918 - object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 - object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 + 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_5, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 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, 918 + object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701 + 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: @ 853B710 warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc index 0c730f37d..533e6af8b 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc @@ -1,13 +1,13 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, 8, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, 14, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, 1, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, 7, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, 10, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716 - object_event 8, 246, 0, 15, 13, 3, 15, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864 - object_event 9, 247, 0, 4, 12, 3, 10, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865 + 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_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716 + object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864 + object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc index b6c6ecdd0..1303c3c33 100644 --- a/data/maps/BattleFrontier_Lounge1/events.inc +++ b/data/maps/BattleFrontier_Lounge1/events.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge1_EventObjects: @ 853CFB4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, 2, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, 2, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 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 warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc index 0616573bd..cc32ddf42 100644 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ b/data/maps/BattleFrontier_Lounge2/events.inc @@ -1,9 +1,9 @@ BattleFrontier_Lounge2_EventObjects: @ 853D11C - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 - object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 - object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, 2, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 + 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 warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc index dbaa20fe1..75f04250c 100644 --- a/data/maps/BattleFrontier_Lounge3/events.inc +++ b/data/maps/BattleFrontier_Lounge3/events.inc @@ -1,9 +1,9 @@ BattleFrontier_Lounge3_EventObjects: @ 853D1B8 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, 7, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, 2, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 + 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_3, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 BattleFrontier_Lounge3_MapWarps: @ 853D230 warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc index 613adfae2..c0dfbcf3e 100644 --- a/data/maps/BattleFrontier_Lounge4/events.inc +++ b/data/maps/BattleFrontier_Lounge4/events.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge4_EventObjects: @ 853D24C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 4, 0, 7, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 - object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 0, 10, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 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_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 BattleFrontier_Lounge4_MapWarps: @ 853D294 warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc index 0224ae0a9..798deb1c2 100644 --- a/data/maps/BattleFrontier_Lounge5/events.inc +++ b/data/maps/BattleFrontier_Lounge5/events.inc @@ -1,8 +1,8 @@ BattleFrontier_Lounge5_EventObjects: @ 853D2EC - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 12, 4, 4, 9, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, 10, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 11, 7, 0, 1, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 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_2, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 BattleFrontier_Lounge5_MapWarps: @ 853D34C warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc index 092be452b..24d7958ec 100644 --- a/data/maps/BattleFrontier_Lounge6/events.inc +++ b/data/maps/BattleFrontier_Lounge6/events.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge6_EventObjects: @ 853D370 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 + 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 warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc index c5490d6c9..901ac6641 100644 --- a/data/maps/BattleFrontier_Lounge7/events.inc +++ b/data/maps/BattleFrontier_Lounge7/events.inc @@ -1,8 +1,8 @@ BattleFrontier_Lounge7_EventObjects: @ 853D3A4 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, 2, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 + 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_OLD_WOMAN_1, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 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 warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc index 116cc007f..92d27d765 100644 --- a/data/maps/BattleFrontier_Lounge8/events.inc +++ b/data/maps/BattleFrontier_Lounge8/events.inc @@ -1,7 +1,7 @@ BattleFrontier_Lounge8_EventObjects: @ 853D4BC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 5, 0, 2, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 BattleFrontier_Lounge8_MapWarps: @ 853D504 warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc index 6500ab66a..6598e0229 100644 --- a/data/maps/BattleFrontier_Lounge9/events.inc +++ b/data/maps/BattleFrontier_Lounge9/events.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge9_EventObjects: @ 853D520 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, 1, 1, 1, 0, 0, 0x0, 0 + 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 warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc index 669945b99..3ca67e038 100644 --- a/data/maps/BattleFrontier_Mart/events.inc +++ b/data/maps/BattleFrontier_Mart/events.inc @@ -1,8 +1,8 @@ BattleFrontier_Mart_EventObjects: @ 853D68C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 + 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_2, 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_2, 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 warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc index 37fa6e7bd..7d25049fd 100644 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -1,30 +1,30 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 20, 17, 0, 27, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 42, 15, 0, 2, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 - object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, 2, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, 9, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 46, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, 28, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0 - object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 45, 47, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, 26, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 18, 40, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 - object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, 10, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 - object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 - object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, 8, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 - object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, 2, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, 46, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 - object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 11, 21, 0, 1, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, 10, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 30, 0, 2, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, 9, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 54, 32, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0 - object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 58, 55, 3, 17, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 - object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 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_4, 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_OLD_WOMAN_1, 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_BOY_4, 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_LITTLE_GIRL_1, 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, 842 + 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_4, 0, 11, 21, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_7, 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_5, 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_2, 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: @ 853BD80 warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc index 643e26e2e..b2315873c 100644 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ b/data/maps/BattleFrontier_OutsideWest/events.inc @@ -1,28 +1,28 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350 - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, 2, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, 10, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, 2, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0 - object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0 - object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, 15, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, 2, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, 3, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, 15, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0 - object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, 2, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0 - object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, 9, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0 - object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, 18, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0 - object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, 3, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0 - object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, 7, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0 - object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, 23, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 - object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, 24, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 + 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_OLD_MAN_1, 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_4, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 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_6, 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_4, 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_3, 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_2, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 + object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc index ba07ed15c..cf0215573 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 - object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 + 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_4, 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 warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc index bb5bb6119..4d0b88090 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc index 239c372c6..ba9d3a30f 100644 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ b/data/maps/BattleFrontier_RankingHall/events.inc @@ -1,7 +1,7 @@ BattleFrontier_RankingHall_EventObjects: @ 853CEB8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, 8, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 + 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_LITTLE_BOY_1, 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 warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc index 34db359fc..c29718501 100644 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ b/data/maps/BattleFrontier_ReceptionGate/events.inc @@ -1,9 +1,9 @@ BattleFrontier_ReceptionGate_EventObjects: @ 853D420 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, 9, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 - object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, 8, 1, 1, 0, 0, 0x0, 836 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 + 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, 836 + 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 warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc index 6e3de083c..3f4dcff86 100644 --- a/data/maps/BattleFrontier_ScottsHouse/events.inc +++ b/data/maps/BattleFrontier_ScottsHouse/events.inc @@ -1,5 +1,5 @@ BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 - object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, 1, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 + 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 warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc index 677499152..bd6b45b82 100644 --- a/data/maps/BattlePyramidSquare01/events.inc +++ b/data/maps/BattlePyramidSquare01/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare01_EventObjects: @ 853A460 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 3, 4, 18, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 2, 6, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, 9, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 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_BOY_4, 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:: @ 853A508 map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc index 1133979ee..67f235026 100644 --- a/data/maps/BattlePyramidSquare02/events.inc +++ b/data/maps/BattlePyramidSquare02/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare02_EventObjects: @ 853A51C - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 1, 4, 17, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + 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_WOMAN_2, 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_LITTLE_GIRL_1, 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:: @ 853A5C4 map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc index 95fdb77bc..1f38240c5 100644 --- a/data/maps/BattlePyramidSquare03/events.inc +++ b/data/maps/BattlePyramidSquare03/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare03_EventObjects: @ 853A5D8 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, 18, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + 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_2, 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_4, 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:: @ 853A680 map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc index 3b19c7f09..f44a6e14c 100644 --- a/data/maps/BattlePyramidSquare04/events.inc +++ b/data/maps/BattlePyramidSquare04/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare04_EventObjects: @ 853A694 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 4, 17, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 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_BOY_4, 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:: @ 853A73C map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc index 17f6aab60..472178c56 100644 --- a/data/maps/BattlePyramidSquare05/events.inc +++ b/data/maps/BattlePyramidSquare05/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare05_EventObjects: @ 853A750 - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + 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:: @ 853A7F8 map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc index 6ae39b52f..3363f6d43 100644 --- a/data/maps/BattlePyramidSquare06/events.inc +++ b/data/maps/BattlePyramidSquare06/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare06_EventObjects: @ 853A80C - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, 16, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, 18, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + 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:: @ 853A8B4 map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc index 788c5e40c..2891e92df 100644 --- a/data/maps/BattlePyramidSquare07/events.inc +++ b/data/maps/BattlePyramidSquare07/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare07_EventObjects: @ 853A8C8 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 4, 10, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 0, 4, 8, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 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_2, 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_2, 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_2, 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:: @ 853A970 map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc index 780fab9ed..f095c3972 100644 --- a/data/maps/BattlePyramidSquare08/events.inc +++ b/data/maps/BattlePyramidSquare08/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare08_EventObjects: @ 853A984 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 2, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 5, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 2, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 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_2, 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_2, 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_2, 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:: @ 853AA2C map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc index 569059af5..265b9b1b6 100644 --- a/data/maps/BattlePyramidSquare09/events.inc +++ b/data/maps/BattlePyramidSquare09/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare09_EventObjects: @ 853AA40 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 0, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 5, 4, 15, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 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_2, 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_2, 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_2, 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:: @ 853AAE8 map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc index ae3c4f88e..b697a7d02 100644 --- a/data/maps/BattlePyramidSquare10/events.inc +++ b/data/maps/BattlePyramidSquare10/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare10_EventObjects: @ 853AAFC - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, 10, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, 9, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, 10, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + 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:: @ 853ABA4 map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc index 0389ee141..6210faa6f 100644 --- a/data/maps/BattlePyramidSquare11/events.inc +++ b/data/maps/BattlePyramidSquare11/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare11_EventObjects: @ 853ABB8 - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, 14, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, 8, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 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_BOY_4, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 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:: @ 853AC60 map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc index db27c6c64..cad871e8d 100644 --- a/data/maps/BattlePyramidSquare12/events.inc +++ b/data/maps/BattlePyramidSquare12/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare12_EventObjects: @ 853AC74 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, 9, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, 10, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + 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:: @ 853AD1C map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc index 12ac8ffe7..af56598c3 100644 --- a/data/maps/BattlePyramidSquare13/events.inc +++ b/data/maps/BattlePyramidSquare13/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare13_EventObjects: @ 853AD30 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, 7, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, 8, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, 7, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + 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:: @ 853ADD8 map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc index c63fabee3..48b98a361 100644 --- a/data/maps/BattlePyramidSquare14/events.inc +++ b/data/maps/BattlePyramidSquare14/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare14_EventObjects: @ 853ADEC - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 1, 4, 17, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, 16, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 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_WOMAN_2, 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_WOMAN_2, 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_WOMAN_2, 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:: @ 853AE94 map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc index f2332f18b..50d0addf2 100644 --- a/data/maps/BattlePyramidSquare15/events.inc +++ b/data/maps/BattlePyramidSquare15/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare15_EventObjects: @ 853AEA8 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 4, 16, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 1, 4, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 4, 15, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 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_WOMAN_2, 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_WOMAN_2, 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_WOMAN_2, 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:: @ 853AF50 map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc index 38d398b5b..84bb566c2 100644 --- a/data/maps/BattlePyramidSquare16/events.inc +++ b/data/maps/BattlePyramidSquare16/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare16_EventObjects: @ 853AF64 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 16, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 0, 18, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 7, 4, 15, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 17, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 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_WOMAN_2, 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_WOMAN_2, 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_WOMAN_2, 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:: @ 853B00C map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc index 86f4d43cb..4093e4086 100644 --- a/data/maps/BirthIsland_Exterior/events.inc +++ b/data/maps/BirthIsland_Exterior/events.inc @@ -1,6 +1,6 @@ BirthIsland_Exterior_EventObjects: @ 853D7DC - object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, 8, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764 - object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, 8, 1, 1, 0, 0, 0x0, 763 + object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764 + object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 763 BirthIsland_Exterior_MapWarps: @ 853D80C warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc index f5c38358d..8b8fe4660 100644 --- a/data/maps/BirthIsland_Harbor/events.inc +++ b/data/maps/BirthIsland_Harbor/events.inc @@ -1,6 +1,6 @@ BirthIsland_Harbor_EventObjects: @ 853D828 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 1, 1, 0, 0, 0x0, 0 + 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 warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc index 72a2c6210..bd1b79bc0 100644 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F_EventObjects: @ 8535DD0 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, 7, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820 CaveOfOrigin_B1F_MapWarps: @ 8535DE8 warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index b7ccd35b0..01a258600 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -1,5 +1,5 @@ DesertRuins_EventObjects: @ 8534354 - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935 + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935 DesertRuins_MapWarps: @ 853436C warp_def 8, 29, 3, 1, MAP_ROUTE111 diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc index 05fb939a0..76215c65a 100644 --- a/data/maps/DesertUnderpass/events.inc +++ b/data/maps/DesertUnderpass/events.inc @@ -1,5 +1,5 @@ DesertUnderpass_EventObjects: @ 85376D4 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, 8, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874 DesertUnderpass_MapWarps: @ 85376EC warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index c96b4c95e..77a6ab889 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -1,9 +1,9 @@ DewfordTown_EventObjects: @ 8527964 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740 + 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, 743 + 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 warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index 11f5d5a92..26ebf4501 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -1,12 +1,12 @@ DewfordTown_Gym_EventObjects: @ 852DB34 - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, 10, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, 8, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 - object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, 10, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 + 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: @ 852DBF4 warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index e12a02a3c..7c494b698 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -1,13 +1,13 @@ DewfordTown_Hall_EventObjects: @ 852DC48 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940 + 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_3, 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_OLD_MAN_1, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 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_2, 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, 940 DewfordTown_Hall_MapWarps: @ 852DD20 warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc index 849bb0244..72a8dc305 100644 --- a/data/maps/DewfordTown_House1/events.inc +++ b/data/maps/DewfordTown_House1/events.inc @@ -1,7 +1,7 @@ DewfordTown_House1_EventObjects: @ 852D9C8 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, 8, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 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 warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc index 8aec9176b..9c03f4ce4 100644 --- a/data/maps/DewfordTown_House2/events.inc +++ b/data/maps/DewfordTown_House2/events.inc @@ -1,6 +1,6 @@ DewfordTown_House2_EventObjects: @ 852DD5C - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 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 warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc index aad05249c..2e43a2239 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 + 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_WOMAN_2, 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_4, 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 warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc index 9c739974b..f9d67ecbf 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index c97236e41..b09221dca 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920 - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921 + 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_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 920 + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 921 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 90c9af1c4..4f61f50ea 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 + 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 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index 5490ed006..63dfbc0df 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 + 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 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2 diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc index 50fc7fbdc..ad5f088c5 100644 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame_EventObjects: @ 85338FC - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0 + 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 warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index 296fe3240..abaa81622 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 + 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 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc index 1f7e26046..7e90c35c7 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793 + 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_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 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, 793 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc index 98671f414..08dbeb5c6 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc index ff2ca71c2..c04a0f30d 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 + 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_4, 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_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc index a09e8ed31..18d45eef9 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702 + 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, 702 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index af4c5de98..a1446aef8 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 + 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 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5 diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 91a98cc28..b6c3400c6 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,8 +1,8 @@ FallarborTown_EventObjects: @ 8527BE0 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907 + 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_OLD_MAN_1, 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, 907 FallarborTown_MapWarps: @ 8527C40 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc index c4e35ebbb..f3c8838e6 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc @@ -1,7 +1,7 @@ FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444 - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 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_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc index 471ca66a3..4af82f353 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/events.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/events.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0 + 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 map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc index 570287ae3..cdcc4c792 100644 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ b/data/maps/FallarborTown_BattleTentLobby/events.inc @@ -1,9 +1,9 @@ FallarborTown_BattleTentLobby_EventObjects: @ 852E370 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, 8, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, 5, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 12, 6, 3, 3, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, 8, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, 10, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767 + 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_2, 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, 767 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc index 5c2323b74..8f16a7869 100644 --- a/data/maps/FallarborTown_House1/events.inc +++ b/data/maps/FallarborTown_House1/events.inc @@ -1,6 +1,6 @@ FallarborTown_House1_EventObjects: @ 852E5B8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 FallarborTown_House1_MapWarps: @ 852E5E8 warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc index 342e2e60b..1b4e1c96e 100644 --- a/data/maps/FallarborTown_House2/events.inc +++ b/data/maps/FallarborTown_House2/events.inc @@ -1,5 +1,5 @@ FallarborTown_House2_EventObjects: @ 852E60C - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 + 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 warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc index 6d7188c6a..f2ec25c13 100644 --- a/data/maps/FallarborTown_Mart/events.inc +++ b/data/maps/FallarborTown_Mart/events.inc @@ -1,9 +1,9 @@ FallarborTown_Mart_EventObjects: @ 852E2D4 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 + 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_3, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 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 warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index 368190914..fffc618eb 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871 + 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_OLD_MAN_1, 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_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 9162a2822..563b6bc50 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc index 8af15533b..e8b94c460 100644 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ b/data/maps/FarawayIsland_Entrance/events.inc @@ -1,6 +1,6 @@ FarawayIsland_Entrance_EventObjects: @ 853D710 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0 + 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 warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc index c2cd25b40..b9242b5be 100644 --- a/data/maps/FarawayIsland_Interior/events.inc +++ b/data/maps/FarawayIsland_Interior/events.inc @@ -1,5 +1,5 @@ FarawayIsland_Interior_EventObjects: @ 853D7A0 - object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, 60, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718 + 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, 718 FarawayIsland_Interior_MapWarps: @ 853D7B8 warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc index 37fecaf5e..3b3985325 100644 --- a/data/maps/FieryPath/events.inc +++ b/data/maps/FieryPath/events.inc @@ -1,12 +1,12 @@ FieryPath_EventObjects: @ 8534C80 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, 1111 FieryPath_MapWarps: @ 8534D40 warp_def 26, 36, 3, 4, MAP_ROUTE112 diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index c943e230d..2b21594a1 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -1,11 +1,11 @@ FortreeCity_EventObjects: @ 8526B9C - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 - object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, 969 + 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_7, 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_2, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 + object_event 6, EVENT_OBJ_GFX_BOY_5, 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, 969 FortreeCity_MapWarps: @ 8526C44 warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc index fe85e94d6..22abe3103 100644 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ b/data/maps/FortreeCity_DecorationShop/events.inc @@ -1,8 +1,8 @@ FortreeCity_DecorationShop_EventObjects: @ 85310B0 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 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 warp_def 3, 5, 0, 8, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 234c10b0c..8abef75e8 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -1,12 +1,12 @@ FortreeCity_Gym_EventObjects: @ 8530C98 - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 23, 3, 10, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, 7, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 + 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_6, 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_6, 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_6, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 FortreeCity_Gym_MapWarps: @ 8530D58 warp_def 15, 24, 0, 2, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc index 99d34626c..35ed2acaf 100644 --- a/data/maps/FortreeCity_House1/events.inc +++ b/data/maps/FortreeCity_House1/events.inc @@ -1,7 +1,7 @@ FortreeCity_House1_EventObjects: @ 8530C2C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 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_OLD_WOMAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 FortreeCity_House1_MapWarps: @ 8530C74 warp_def 3, 5, 0, 1, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc index 2d78b2774..43bc1fdfc 100644 --- a/data/maps/FortreeCity_House2/events.inc +++ b/data/maps/FortreeCity_House2/events.inc @@ -1,6 +1,6 @@ FortreeCity_House2_EventObjects: @ 8530F30 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 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_OLD_MAN_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 FortreeCity_House2_MapWarps: @ 8530F60 warp_def 3, 5, 0, 4, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc index 54ac6ed6a..23ae10688 100644 --- a/data/maps/FortreeCity_House3/events.inc +++ b/data/maps/FortreeCity_House3/events.inc @@ -1,6 +1,6 @@ FortreeCity_House3_EventObjects: @ 8530F84 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 + 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 warp_def 3, 5, 0, 5, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc index 1bddf3416..c038066e4 100644 --- a/data/maps/FortreeCity_House4/events.inc +++ b/data/maps/FortreeCity_House4/events.inc @@ -1,7 +1,7 @@ FortreeCity_House4_EventObjects: @ 8530FD8 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 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, 933 FortreeCity_House4_MapWarps: @ 8531020 warp_def 3, 5, 0, 6, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc index d6c03578e..0c716961a 100644 --- a/data/maps/FortreeCity_House5/events.inc +++ b/data/maps/FortreeCity_House5/events.inc @@ -1,7 +1,7 @@ FortreeCity_House5_EventObjects: @ 8531044 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 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 warp_def 3, 5, 0, 7, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc index 115b04ccd..5335df01d 100644 --- a/data/maps/FortreeCity_Mart/events.inc +++ b/data/maps/FortreeCity_Mart/events.inc @@ -1,8 +1,8 @@ FortreeCity_Mart_EventObjects: @ 8530EAC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 + 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_3, 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 warp_def 3, 7, 0, 3, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc index 4b681b5cb..e63b6eabb 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 + 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_4, 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 warp_def 7, 8, 3, 0, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc index 7a7f666b2..43e74e0d7 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc index 83368e186..bba8bbe40 100644 --- a/data/maps/GraniteCave_1F/events.inc +++ b/data/maps/GraniteCave_1F/events.inc @@ -1,6 +1,6 @@ GraniteCave_1F_EventObjects: @ 85343BC - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050 + 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, 1050 GraniteCave_1F_MapWarps: @ 85343EC warp_def 37, 12, 3, 0, MAP_ROUTE106 diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc index 90b0f498e..4b4a08870 100644 --- a/data/maps/GraniteCave_B1F/events.inc +++ b/data/maps/GraniteCave_B1F/events.inc @@ -1,5 +1,5 @@ GraniteCave_B1F_EventObjects: @ 8534420 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051 GraniteCave_B1F_MapWarps: @ 8534438 warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index d7ce41812..bcc0a5a4e 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_EventObjects: @ 8534484 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23 GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc index 49e808cda..43cc6e444 100644 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom_EventObjects: @ 85345B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833 GraniteCave_StevensRoom_MapWarps: @ 85345C8 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index 5dafdf1fd..104df23d2 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -1,7 +1,7 @@ InsideOfTruck_EventObjects: @ 853A078 - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 + 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 warp_def 4, 1, 0, 127, MAP_NONE diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index d7807a725..c02d93dde 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -1,5 +1,5 @@ IslandCave_EventObjects: @ 8536C74 - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936 + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936 IslandCave_MapWarps: @ 8536C8C warp_def 8, 29, 3, 0, MAP_ROUTE105 diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index fe193cd97..ce6eb77bd 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -1,11 +1,11 @@ JaggedPass_EventObjects: @ 8534AE4 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, 16, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, 7, 1, 1, 0, 0, JaggedPass_EventScript_230718, 847 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, 10, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 - object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, 9, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 + 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, 1070 + 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, 847 + 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 warp_def 14, 40, 3, 2, MAP_ROUTE112 diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index cf32b8377..755e606b0 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -1,13 +1,13 @@ LavaridgeTown_EventObjects: @ 8527A54 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 - object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930 - object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 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_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 930 + object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 929 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 LavaridgeTown_MapWarps: @ 8527B2C warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index cc35053f0..8560ee3a8 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -1,10 +1,10 @@ LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 + 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_6, 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_4, 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_6, 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: @ 852DEAC warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc index eabf8e51d..cccd9cb14 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc @@ -1,8 +1,8 @@ LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 4, 18, 3, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 6, 0, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 13, 17, 0, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, 8, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 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_6, 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_6, 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 warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc index dd5ffdbe9..8a80c4f75 100644 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ b/data/maps/LavaridgeTown_HerbShop/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 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_2, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc index 17809fc45..85a9d859e 100644 --- a/data/maps/LavaridgeTown_House/events.inc +++ b/data/maps/LavaridgeTown_House/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_House_EventObjects: @ 852E0DC - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 4, 3, 2, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 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_LITTLE_BOY_1, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 LavaridgeTown_House_MapWarps: @ 852E124 warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc index 0206eefd7..a5537f9ca 100644 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ b/data/maps/LavaridgeTown_Mart/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_Mart_EventObjects: @ 852E148 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 + 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_OLD_MAN_1, 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_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 LavaridgeTown_Mart_MapWarps: @ 852E190 warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc index 767f01713..1586553f2 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 + 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_4, 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 warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc index 3191e7533..e55b08e7b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 343249c2d..421a2c094 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -1,26 +1,26 @@ LilycoveCity_EventObjects: @ 8526CE8 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852 - object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852 - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 - object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, 8, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, 10, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 41, 25, 3, 9, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 - object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, 10, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 - object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, 8, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 - object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, 7, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 + 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_BOY_4, 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_3, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 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, 852 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042 + 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, 852 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852 + object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852 + 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_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971 + 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_4, 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: @ 8526EF8 warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index dd5655beb..c7477af3c 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -1,36 +1,36 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 - object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 - object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0 - object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 + 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_4, 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_OLD_MAN_1, 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_WOMAN_6, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 + object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 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_4, 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_5, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 + object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 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_WOMAN_2, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_3, 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_4, 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_OLD_WOMAN_1, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 + object_event 29, EVENT_OBJ_GFX_WOMAN_3, 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_2, 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 warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index d7c31c837..27448106f 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -1,29 +1,29 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802 - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895 - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 - object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 7, 3, 3, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 - object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 27, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832 - object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832 - object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832 - object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832 - object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, 7, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832 - object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832 - object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832 - object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, 10, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 + 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_5, 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, 774 + 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, 802 + 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_LITTLE_GIRL_1, 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, 895 + 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_LITTLE_BOY_1, 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_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 + object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873 + 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_6, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832 + object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832 + object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832 + object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832 + object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832 + object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832 + object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832 + object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index 7ccbc4aec..5595da718 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 + 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 warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc index 631eba91b..c0869f319 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -1,11 +1,11 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925 + 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, 925 + 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, 925 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc index bdeda0bd9..adafc5b61 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 + 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 warp_def 1, 5, 3, 127, MAP_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index aca7598ec..8492376e2 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -1,8 +1,8 @@ LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 + 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_4, 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, 962 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index 17a6db615..3ebc7c803 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -1,10 +1,10 @@ LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 + 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_WOMAN_2, 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_2, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 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 warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc index 1747ece5a..11fd1c403 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C - object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 + 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_WOMAN_2, 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_4, 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_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc index 93ef37b4b..7042a1483 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 + 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_MAN_3, 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_7, 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_4, 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_4, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc index 5e6d0d94a..8fe1ec45e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 + 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_3, 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_4, 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_4, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc index f2b9b130a..9b56742a2 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc @@ -1,11 +1,11 @@ LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 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_4, 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_4, 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_4, 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_4, 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_3, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc index 73d21e9ce..6a157a1ad 100644 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -1,9 +1,9 @@ LilycoveCity_Harbor_EventObjects: @ 8531E1C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, 8, 1, 1, 0, 0, 0x0, 748 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 861 + 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, 909 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 748 LilycoveCity_Harbor_MapWarps: @ 8531E94 warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc index d268037ba..d5768e01c 100644 --- a/data/maps/LilycoveCity_House1/events.inc +++ b/data/maps/LilycoveCity_House1/events.inc @@ -1,6 +1,6 @@ LilycoveCity_House1_EventObjects: @ 8531EF4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 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 warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc index 7e5276102..e4839eb5c 100644 --- a/data/maps/LilycoveCity_House2/events.inc +++ b/data/maps/LilycoveCity_House2/events.inc @@ -1,5 +1,5 @@ LilycoveCity_House2_EventObjects: @ 8531F48 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 + 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 warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc index 4f582bdef..89f48e9f3 100644 --- a/data/maps/LilycoveCity_House3/events.inc +++ b/data/maps/LilycoveCity_House3/events.inc @@ -1,10 +1,10 @@ LilycoveCity_House3_EventObjects: @ 8531F84 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 - object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 - object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 + object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 + object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 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 warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc index e85c296d3..6e447bf9c 100644 --- a/data/maps/LilycoveCity_House4/events.inc +++ b/data/maps/LilycoveCity_House4/events.inc @@ -1,6 +1,6 @@ LilycoveCity_House4_EventObjects: @ 8532038 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 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 warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index 47b39c6ee..7a66d580c 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -1,14 +1,14 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775 - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776 - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779 - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780 - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778 + 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, 775 + 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_LITTLE_BOY_1, 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_5, 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_3, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776 + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779 + 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, 780 + 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, 778 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index ba1e74e65..968a61b1d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -1,8 +1,8 @@ LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780 + 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, 777 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc index 784b388ae..a1be3924f 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc index dce57df3d..42b4949a2 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 - object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 - object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993 + 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_HIPSTER, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 + object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc index ec8e4cf6e..910dd36ab 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc index 228e56e4d..be478e45c 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -1,13 +1,13 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790 - object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789 - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, 8, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730 + 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_5, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 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_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790 + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index c1bdfe3fb..c87a35486 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -1,18 +1,18 @@ LinkContestRoom1_EventObjects: @ 8539EFC - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 7, 246, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 8, 247, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 9, 248, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 10, 249, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 11, 250, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86 - object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 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_HIPSTER, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 7, 246, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 8, 247, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 9, 248, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 10, 249, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 11, 250, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 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, 86 + object_event 14, EVENT_OBJ_GFX_GIDDY, 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 diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index 23b8cc3e5..fd257b17d 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -1,12 +1,12 @@ LittlerootTown_EventObjects: @ 85276A8 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 16, 10, 3, 2, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, 868 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752 - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761 - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762 - object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, 7, 1, 1, 0, 0, 0x0, 794 - object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, 7, 1, 1, 0, 0, 0x0, 795 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 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, 868 + 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, 752 + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 761 + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 762 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 794 + object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 795 LittlerootTown_MapWarps: @ 8527768 warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index cd08fbad8..df0022c99 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -1,11 +1,11 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758 - object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755 - object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 1, 1, 0, 0, 0x0, 734 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, 5, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, 7, 1, 1, 0, 0, 0x0, 745 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 734 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 745 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index a6649c9b6..fbcc38a03 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -1,20 +1,20 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, 1, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817 - object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, 1, 1, 1, 0, 0, 0x0, 815 + 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, 760 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757 + 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, 817 + object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 815 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 6822c20e8..34eeeb750 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -1,11 +1,11 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759 - object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754 - object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785 - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 1, 1, 0, 0, 0x0, 734 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, 5, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736 - object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, 7, 1, 1, 0, 0, 0x0, 746 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 734 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736 + object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 746 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index a5f1dd43c..037f0538a 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -1,20 +1,20 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757 - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 1, 1, 0, 0, 0x0, 849 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, 1, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818 + 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, 722 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757 + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 849 + 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, 818 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index a4596ce5c..41e5112f7 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -1,10 +1,10 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721 - object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, 8, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838 + 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, 721 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc index 1274e2373..2fa18eade 100644 --- a/data/maps/MagmaHideout_1F/events.inc +++ b/data/maps/MagmaHideout_1F/events.inc @@ -1,10 +1,10 @@ MagmaHideout_1F_EventObjects: @ 85371CC - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, 10, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, 857 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, 1, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, 9, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19 + 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, 857 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151 + 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, 857 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19 MagmaHideout_1F_MapWarps: @ 853725C warp_def 10, 34, 3, 4, MAP_JAGGED_PASS diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc index 32f835efc..723c9e914 100644 --- a/data/maps/MagmaHideout_2F_1R/events.inc +++ b/data/maps/MagmaHideout_2F_1R/events.inc @@ -1,8 +1,8 @@ MagmaHideout_2F_1R_EventObjects: @ 8537290 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, 51, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, 46, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, 10, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, 7, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857 + 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, 857 + 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, 857 + 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, 857 + 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, 857 MagmaHideout_2F_1R_MapWarps: @ 85372F0 warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc index 5567bf9cf..277dcf530 100644 --- a/data/maps/MagmaHideout_2F_2R/events.inc +++ b/data/maps/MagmaHideout_2F_2R/events.inc @@ -1,10 +1,10 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, 9, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, 10, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, 1, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, 8, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, 10, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165 + 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, 857 + 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, 857 + 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, 1164 + 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, 857 + 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, 857 + 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, 1165 MagmaHideout_2F_2R_MapWarps: @ 85373AC warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc index b2f157f57..0f3ff3529 100644 --- a/data/maps/MagmaHideout_3F_1R/events.inc +++ b/data/maps/MagmaHideout_3F_1R/events.inc @@ -1,7 +1,7 @@ MagmaHideout_3F_1R_EventObjects: @ 85373D0 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, 10, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, 9, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166 + 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, 857 + 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, 857 + 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, 1166 MagmaHideout_3F_1R_MapWarps: @ 8537418 warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc index 27ea129c3..d2bd79078 100644 --- a/data/maps/MagmaHideout_3F_2R/events.inc +++ b/data/maps/MagmaHideout_3F_2R/events.inc @@ -1,6 +1,6 @@ MagmaHideout_3F_2R_EventObjects: @ 8537444 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, 17, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167 + 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, 857 + 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, 1167 MagmaHideout_3F_2R_MapWarps: @ 8537474 warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc index 3f96b5652..2ced1f4fd 100644 --- a/data/maps/MagmaHideout_3F_3R/events.inc +++ b/data/maps/MagmaHideout_3F_3R/events.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_3R_EventObjects: @ 8537574 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, 1, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059 + 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, 1059 MagmaHideout_3F_3R_MapWarps: @ 853758C warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc index 1865c3b84..435099c47 100644 --- a/data/maps/MagmaHideout_4F/events.inc +++ b/data/maps/MagmaHideout_4F/events.inc @@ -1,12 +1,12 @@ MagmaHideout_4F_EventObjects: @ 8537490 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, 8, 1, 1, 0, 0, 0x0, 853 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, 9, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, 10, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, 8, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857 - object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, 7, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857 - object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, 8, 1, 1, 0, 0, 0x0, 850 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, 1, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 853 + 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, 857 + 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, 857 + 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, 857 + 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, 857 + object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857 + object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 850 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168 MagmaHideout_4F_MapWarps: @ 8537550 warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc index 14903539b..0d3014ab1 100644 --- a/data/maps/MarineCave_End/events.inc +++ b/data/maps/MarineCave_End/events.inc @@ -1,5 +1,5 @@ MarineCave_End_EventObjects: @ 85377E8 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, 8, 1, 1, 0, 0, 0x0, 782 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 782 MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index c8318005c..cc393513d 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -1,15 +1,15 @@ MauvilleCity_EventObjects: @ 852662C - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805 - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 - object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765 + 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_BOY_4, 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_5, 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, 804 + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805 + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116 + 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, 765 MauvilleCity_MapWarps: @ 8526734 warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index b4c0d19df..c1ee85909 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -1,6 +1,6 @@ MauvilleCity_BikeShop_EventObjects: @ 852FE80 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 + 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_6, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 MauvilleCity_BikeShop_MapWarps: @ 852FEB0 warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index a956f16d8..8c30b75b7 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -1,16 +1,16 @@ MauvilleCity_GameCorner_EventObjects: @ 852FF28 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 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_MAN_3, 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_2, 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_4, 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_7, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 MauvilleCity_GameCorner_MapWarps: @ 8530048 warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index 08c8db444..c1b2b0053 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -1,11 +1,11 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, 7, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913 + object_event 2, EVENT_OBJ_GFX_MAN_6, 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_6, 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: @ 852FE04 warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc index 2590e33b9..1d759b438 100644 --- a/data/maps/MauvilleCity_House1/events.inc +++ b/data/maps/MauvilleCity_House1/events.inc @@ -1,5 +1,5 @@ MauvilleCity_House1_EventObjects: @ 852FEEC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 + 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 warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc index f8e04f5ea..3ac497bbc 100644 --- a/data/maps/MauvilleCity_House2/events.inc +++ b/data/maps/MauvilleCity_House2/events.inc @@ -1,5 +1,5 @@ MauvilleCity_House2_EventObjects: @ 853018C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 MauvilleCity_House2_MapWarps: @ 85301A4 warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc index f67840783..5e96dcfd3 100644 --- a/data/maps/MauvilleCity_Mart/events.inc +++ b/data/maps/MauvilleCity_Mart/events.inc @@ -1,7 +1,7 @@ MauvilleCity_Mart_EventObjects: @ 8530310 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 + 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_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 MauvilleCity_Mart_MapWarps: @ 8530358 warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc index adab7d3e4..4000ead3e 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 + 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_HIPSTER, 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_7, 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 warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc index c3a0c4990..d445b3cca 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, 7, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 + 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, 702 + 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 warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 977559950..21535add7 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -1,14 +1,14 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938 - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942 + 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, 1044 + 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, 1046 + 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, 1045 + 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, 1047 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 939 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 939 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 938 + 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, 942 MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 27, 18, 4, 0, MAP_ROUTE114 diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index 0436851c5..4cab5be37 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -1,7 +1,7 @@ MeteorFalls_1F_2R_EventObjects: @ 85340C4 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 MeteorFalls_1F_2R_MapWarps: @ 853410C warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc index 8e2c9e1c4..85dafb869 100644 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R_EventObjects: @ 8534190 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080 + 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, 1080 MeteorFalls_B1F_2R_MapWarps: @ 85341A8 warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc index ff920f86d..09225365d 100644 --- a/data/maps/MeteorFalls_StevensCave/events.inc +++ b/data/maps/MeteorFalls_StevensCave/events.inc @@ -1,5 +1,5 @@ MeteorFalls_StevensCave_EventObjects: @ 85378B0 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, 7, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 + 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 warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc index e12b4873d..d62e54f92 100644 --- a/data/maps/MirageTower_3F/events.inc +++ b/data/maps/MirageTower_3F/events.inc @@ -1,6 +1,6 @@ MirageTower_3F_EventObjects: @ 853761C - object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, 1, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 17 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, 1, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 18 + object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 17 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 18 MirageTower_3F_MapWarps: @ 853764C warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc index 7b215a83a..b9574637a 100644 --- a/data/maps/MirageTower_4F/events.inc +++ b/data/maps/MirageTower_4F/events.inc @@ -1,7 +1,7 @@ MirageTower_4F_EventObjects: @ 8537670 - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, 8, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, 963 - object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, 8, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, 964 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, 1, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, 17 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, 963 + object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, 964 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, 17 MirageTower_4F_MapWarps: @ 85376B8 warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index d288400b5..c95cdf5cf 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -1,21 +1,21 @@ MossdeepCity_EventObjects: @ 8527018 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043 - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, 8, 1, 1, 0, 0, 0x0, 823 - object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, 7, 1, 1, 0, 0, 0x0, 823 - object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, 8, 1, 1, 0, 0, 0x0, 823 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, 7, 1, 1, 0, 0, 0x0, 823 - object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, 9, 1, 1, 0, 0, 0x0, 823 - object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0 - object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788 - object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, 64, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 + 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_OLD_MAN_1, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 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, 1043 + 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, 823 + object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823 + object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823 + object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 823 + 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, 788 + 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 warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 42face3c4..603d7f3d8 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -1,6 +1,6 @@ MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 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_5, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc index 7146d30b8..58ca66fd2 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index e383463af..8245f1fc2 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -1,40 +1,40 @@ MossdeepCity_Gym_EventObjects: @ 85324EC - object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0 - object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, 10, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0 - object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0 - object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, 9, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0 - object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, 8, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0 - object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, 7, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0 - object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, 1, 1, 1, 0, 0, 0x0, 0 + 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: @ 853284C warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc index a7832fb09..00e7a12fc 100644 --- a/data/maps/MossdeepCity_House1/events.inc +++ b/data/maps/MossdeepCity_House1/events.inc @@ -1,6 +1,6 @@ MossdeepCity_House1_EventObjects: @ 8532978 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 + 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_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 MossdeepCity_House1_MapWarps: @ 85329A8 warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc index 86ba58946..b38d1bf8d 100644 --- a/data/maps/MossdeepCity_House2/events.inc +++ b/data/maps/MossdeepCity_House2/events.inc @@ -1,7 +1,7 @@ MossdeepCity_House2_EventObjects: @ 85329CC - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 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, 934 MossdeepCity_House2_MapWarps: @ 8532A14 warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc index e40e79e10..374808598 100644 --- a/data/maps/MossdeepCity_House3/events.inc +++ b/data/maps/MossdeepCity_House3/events.inc @@ -1,5 +1,5 @@ MossdeepCity_House3_EventObjects: @ 8532BD4 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 + 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 warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc index 96d8fe7d8..048bd5ffd 100644 --- a/data/maps/MossdeepCity_House4/events.inc +++ b/data/maps/MossdeepCity_House4/events.inc @@ -1,7 +1,7 @@ MossdeepCity_House4_EventObjects: @ 8532CAC - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 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 warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc index d8314e6e5..9fb1f674a 100644 --- a/data/maps/MossdeepCity_Mart/events.inc +++ b/data/maps/MossdeepCity_Mart/events.inc @@ -1,8 +1,8 @@ MossdeepCity_Mart_EventObjects: @ 8532B50 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 + 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_7, 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 warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc index 7e56185b2..ed26d83cb 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 + 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_3, 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 warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc index c5d5af15a..e13367153 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -1,9 +1,9 @@ MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 7, 3, 5, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 + 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, 702 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 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 warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc index fa5a8f3bb..fe1d4fcf8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -1,15 +1,15 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, 9, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, 9, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, 8, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756 - object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, 8, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756 - object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, 76, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737 - object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, 8, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753 + 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_2, 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_5, 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, 756 + 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, 756 + 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, 756 + 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, 756 + object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737 + object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc index bf143934e..b1e7373da 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -1,13 +1,13 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 - object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, 8, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, 10, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, 7, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862 - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, 9, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862 - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, 10, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862 - object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, 7, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862 + object_event 1, EVENT_OBJ_GFX_BOY_4, 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, 863 + 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, 862 + 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, 862 + 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, 862 + 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, 862 + object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index 0ee8e7d15..521c71e72 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_EventObjects: @ 8532C10 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727 MossdeepCity_StevensHouse_MapWarps: @ 8532C58 warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index bb7e1a913..a8002de8f 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -1,34 +1,34 @@ MtChimney_EventObjects: @ 85347C8 - object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926 - object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927 - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927 - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927 - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927 - object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927 - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927 - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 - object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877 - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877 - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877 - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877 - object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, 9, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, 927 - object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, 10, 1, 1, 1, 6, MtChimney_EventScript_22F208, 877 + object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926 + object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927 + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927 + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927 + object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927 + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927 + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926 + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927 + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877 + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877 + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877 + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877 + object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, 927 + object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, 877 MtChimney_MapWarps: @ 8534A98 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc index 19385b3d5..491ca7997 100644 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ b/data/maps/MtChimney_CableCarStation/events.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_EventObjects: @ 8533CA8 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + 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 warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index 80bf46c2e..179a6a538 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,7 +1,7 @@ MtPyre_1F_EventObjects: @ 8534D64 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 MtPyre_1F_MapWarps: @ 8534DAC warp_def 17, 18, 3, 0, MAP_ROUTE122 diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc index d5b24c06f..6c334ac0c 100644 --- a/data/maps/MtPyre_2F/events.inc +++ b/data/maps/MtPyre_2F/events.inc @@ -1,12 +1,12 @@ MtPyre_2F_EventObjects: @ 8534DF0 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, 10, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0 - object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, 7, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 - object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 + 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, 1129 + 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_MAN_3, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 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: @ 8534EB0 warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index bf0d1af77..ed9caf9f3 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,8 +1,8 @@ MtPyre_3F_EventObjects: @ 8534EEC - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, 17, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 14, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 + 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, 1120 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc index e39075d8b..73c0a59cf 100644 --- a/data/maps/MtPyre_4F/events.inc +++ b/data/maps/MtPyre_4F/events.inc @@ -1,6 +1,6 @@ MtPyre_4F_EventObjects: @ 8534F90 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, 1130 + 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, 1130 MtPyre_4F_MapWarps: @ 8534FC0 warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc index 03a9b773f..e1fffe025 100644 --- a/data/maps/MtPyre_5F/events.inc +++ b/data/maps/MtPyre_5F/events.inc @@ -1,6 +1,6 @@ MtPyre_5F_EventObjects: @ 8535004 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, 1052 + 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, 1052 MtPyre_5F_MapWarps: @ 8535034 warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc index 1f00209b2..607c0902a 100644 --- a/data/maps/MtPyre_6F/events.inc +++ b/data/maps/MtPyre_6F/events.inc @@ -1,7 +1,7 @@ MtPyre_6F_EventObjects: @ 8535070 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, 24, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 + 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, 1089 + 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 warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index badd884f9..ec247fd67 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -1,6 +1,6 @@ MtPyre_Exterior_EventObjects: @ 85350DC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074 MtPyre_Exterior_MapWarps: @ 853510C warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 2df3aaafd..35107f3f0 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,12 +1,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, 9, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, 917 - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, 7, 1, 1, 0, 0, 0x0, 856 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 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, 916 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 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, 917 + 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, 917 + 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, 917 + 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, 917 + object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 856 MtPyre_Summit_MapWarps: @ 8535260 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc index fec170ae9..49a39c162 100644 --- a/data/maps/NavelRock_Bottom/events.inc +++ b/data/maps/NavelRock_Bottom/events.inc @@ -1,5 +1,5 @@ NavelRock_Bottom_EventObjects: @ 853DD50 - object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, 8, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800 + object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800 NavelRock_Bottom_MapWarps: @ 853DD68 warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc index 2ffdc5fa1..b5a299572 100644 --- a/data/maps/NavelRock_Harbor/events.inc +++ b/data/maps/NavelRock_Harbor/events.inc @@ -1,6 +1,6 @@ NavelRock_Harbor_EventObjects: @ 853DA24 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, 7, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, 10, 1, 1, 0, 0, 0x0, 0 + 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 warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index dc7c1e7df..6f7253a2b 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -1,5 +1,5 @@ NavelRock_Top_EventObjects: @ 853DB74 - object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 801 + object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 801 NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index 794f1965c..805c1db6e 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -1,12 +1,12 @@ NewMauville_Inside_EventObjects: @ 85364A8 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, 1110 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, 1122 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, 1123 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, 974 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, 975 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, 976 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, 1110 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, 1122 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, 1123 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, 974 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, 975 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, 976 NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index b7bc6ab08..1ba9ea124 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -1,8 +1,8 @@ OldaleTown_EventObjects: @ 8527854 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 - object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, 7, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, 979 + 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_HIPSTER, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, 979 OldaleTown_MapWarps: @ 85278B4 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc index cf853c8ac..4933604d4 100644 --- a/data/maps/OldaleTown_House1/events.inc +++ b/data/maps/OldaleTown_House1/events.inc @@ -1,5 +1,5 @@ OldaleTown_House1_EventObjects: @ 852D7B4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 OldaleTown_House1_MapWarps: @ 852D7CC warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc index 2feeb8949..a57b07c26 100644 --- a/data/maps/OldaleTown_House2/events.inc +++ b/data/maps/OldaleTown_House2/events.inc @@ -1,6 +1,6 @@ OldaleTown_House2_EventObjects: @ 852D7F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 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 warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc index f850fa482..73adf3718 100644 --- a/data/maps/OldaleTown_Mart/events.inc +++ b/data/maps/OldaleTown_Mart/events.inc @@ -1,7 +1,7 @@ OldaleTown_Mart_EventObjects: @ 852D95C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 + 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_7, 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 warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc index bb102baab..ba50faea9 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 + 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 warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc index b25b155ea..fe8490c9c 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index 41d54e9fc..8e1134f86 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_EventObjects: @ 8527DE8 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 + 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_LITTLE_BOY_1, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 PacifidlogTown_MapWarps: @ 8527E30 warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc index 77ca4c832..4bc239ea6 100644 --- a/data/maps/PacifidlogTown_House1/events.inc +++ b/data/maps/PacifidlogTown_House1/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House1_EventObjects: @ 852EBA0 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 PacifidlogTown_House1_MapWarps: @ 852EBD0 warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc index 450533014..fae916c73 100644 --- a/data/maps/PacifidlogTown_House2/events.inc +++ b/data/maps/PacifidlogTown_House2/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_House2_EventObjects: @ 852EBF4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 + 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 warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc index 635ba86a7..bdf1aae10 100644 --- a/data/maps/PacifidlogTown_House3/events.inc +++ b/data/maps/PacifidlogTown_House3/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House3_EventObjects: @ 852EC60 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 + 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_4, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 PacifidlogTown_House3_MapWarps: @ 852EC90 warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc index e5f8dd4f1..bcd3dc6e9 100644 --- a/data/maps/PacifidlogTown_House4/events.inc +++ b/data/maps/PacifidlogTown_House4/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_House4_EventObjects: @ 852ECB4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 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_2, 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 warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc index febb80ad6..f039b7694 100644 --- a/data/maps/PacifidlogTown_House5/events.inc +++ b/data/maps/PacifidlogTown_House5/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House5_EventObjects: @ 852ED20 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 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 warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc index 66b8caa67..8040086f8 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 + 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_2, 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_6, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc index 1aa279980..1b961ee74 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 29fe0e02e..f33ff0918 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -1,13 +1,13 @@ PetalburgCity_EventObjects: @ 8525FD0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728 - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 - object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, 1, 1, 1, 0, 0, 0x0, 995 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 726 + 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_MAN_3, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 830 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040 + 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, 995 PetalburgCity_MapWarps: @ 85260A8 warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index 2df386d2c..e3cfe95cc 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -1,15 +1,15 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781 - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866 - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, 7, 1, 1, 0, 0, 0x0, 824 + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 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, 781 + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 866 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 824 PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc index dcd3b071f..4688eefe6 100644 --- a/data/maps/PetalburgCity_House1/events.inc +++ b/data/maps/PetalburgCity_House1/events.inc @@ -1,6 +1,6 @@ PetalburgCity_House1_EventObjects: @ 852F0BC - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 + 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_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 PetalburgCity_House1_MapWarps: @ 852F0EC warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc index 7d1a863cb..17f9001e2 100644 --- a/data/maps/PetalburgCity_House2/events.inc +++ b/data/maps/PetalburgCity_House2/events.inc @@ -1,6 +1,6 @@ PetalburgCity_House2_EventObjects: @ 852F110 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 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 warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc index 3dc327c6a..88d99918d 100644 --- a/data/maps/PetalburgCity_Mart/events.inc +++ b/data/maps/PetalburgCity_Mart/events.inc @@ -1,8 +1,8 @@ PetalburgCity_Mart_EventObjects: @ 852F294 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 + 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_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 PetalburgCity_Mart_MapWarps: @ 852F2F4 warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc index e7a4ec6e6..509ed0094 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 + 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_5, 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_7, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc index 7d2ff52f4..d83875c10 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc index 563d61579..cc43ca814 100644 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ b/data/maps/PetalburgCity_WallysHouse/events.inc @@ -1,6 +1,6 @@ PetalburgCity_WallysHouse_EventObjects: @ 852ED74 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index da904f8ef..aaab1e751 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -1,17 +1,17 @@ PetalburgWoods_EventObjects: @ 85345E4 - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, 1117 - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 725 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 724 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058 + 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, 1117 + 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 warp_def 14, 5, 0, 2, MAP_ROUTE104 diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index 7970c14ba..b5e297f72 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -1,5 +1,5 @@ RecordCorner_EventObjects: @ 8539DFC - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 RecordCorner_MapWarps: @ 8539E14 warp_def 8, 9, 3, 127, MAP_NONE diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 82b674f9e..969166de9 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,10 +1,10 @@ Route101_EventObjects: @ 8527E98 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720 - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750 - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991 + 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, 720 + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, 750 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, 897 + 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, 991 Route101_MapCoordEvents: @ 8527F28 coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index fc30a195c..a51e09b59 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -1,13 +1,13 @@ Route102_EventObjects: @ 8527FD8 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 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, 1000 + 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: @ 85280B0 bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index e4bf74177..ab858ae13 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -1,24 +1,24 @@ Route103_EventObjects: @ 85280DC - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_272141, 898 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, 1, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 18 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_2906BB, 19 - object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, 8, 1, 1, 1, 2, Route103_EventScript_1EC761, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, 7, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0 - object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, 26, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0 - object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, 25, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, 1, 1, 1, 0, 0, Route103_EventScript_290CF2, 1137 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 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, 898 + object_event 12, EVENT_OBJ_GFX_MAN_3, 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, 1114 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 18 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 19 + 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_6, 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, 1137 Route103_MapWarps: @ 85282BC warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 315b5614e..52a60261a 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -1,38 +1,38 @@ Route104_EventObjects: @ 85282E4 - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 0, 1, 0, 0, Route104_EventScript_1ED045, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742 - object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738 - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002 - object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906 - object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 - object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 - object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D0C, 1057 - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 5, 6, 1, 2, Route104_EventScript_1ED376, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D19, 1115 - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_2906BB, 17 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 1, 1, 0, 0, Route104_EventScript_290D26, 1135 - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 - object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 - object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, 1, 1, 1, 0, 0, Route104_EventScript_1ECC9E, 719 + 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_3, 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, 742 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 738 + 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_OLD_WOMAN_1, 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, 1002 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906 + object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 + object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 + object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 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, 1057 + 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, 1115 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, 17 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, 1135 + 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_HIPSTER, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, 719 Route104_MapWarps: @ 8528614 warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc index 9eccc2286..6410f02fc 100644 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -1,6 +1,6 @@ Route104_MrBrineysHouse_EventObjects: @ 8533AD4 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881 Route104_MrBrineysHouse_MapWarps: @ 8533B04 warp_def 5, 8, 0, 0, MAP_ROUTE104 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc index 025daad04..3d622f106 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc @@ -1,7 +1,7 @@ Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 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 warp_def 2, 8, 0, 1, MAP_ROUTE104 diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index bbe9cf73b..cf7addcc8 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -1,12 +1,12 @@ Route105_EventObjects: @ 85286F0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, 25, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, 26, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, 8, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 - object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, 7, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 + 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, 1003 + 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_6, 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 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 8fdbaad5f..22807fcec 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -1,9 +1,9 @@ Route106_EventObjects: @ 85287E4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004 + 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, 1004 Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc index f748e2ff9..b67e98384 100644 --- a/data/maps/Route107/events.inc +++ b/data/maps/Route107/events.inc @@ -1,11 +1,11 @@ Route107_EventObjects: @ 85288A8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, 65, 1, 1, 1, 5, Route107_EventScript_1EE625, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, 64, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 + 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:: @ 8528950 map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index 0a0b448c4..a83027178 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -1,11 +1,11 @@ Route108_EventObjects: @ 8528964 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, 13, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, 10, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, 9, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, 1, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139 + 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_7, 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, 1139 Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 1d847897d..66527a7ae 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -1,28 +1,28 @@ Route109_EventObjects: @ 8528A34 - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005 - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, 10, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, 9, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 - object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, 80, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 - object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, 79, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_290D67, 1140 - object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, 80, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 744 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, 741 + 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_2, 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, 1005 + 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_WOMAN_2, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0 + object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 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, 1140 + object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 Route109_MapWarps: @ 8528C74 warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc index 140b92a21..9c12bd582 100644 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ b/data/maps/Route109_SeashoreHouse/events.inc @@ -1,8 +1,8 @@ Route109_SeashoreHouse_EventObjects: @ 853DDE8 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 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 warp_def 6, 9, 0, 0, MAP_ROUTE109 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index a38375d8e..4cb99b121 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -1,40 +1,40 @@ Route110_EventObjects: @ 8528CF0 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 1, 1, 0, 0, Route110_EventScript_1EF314, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 1, 1, 0, 0, Route110_EventScript_1EF302, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 2, 14, 1, 3, Route110_EventScript_1EF529, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 1, 1, 1, 4, Route110_EventScript_1EF540, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006 - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0 - object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900 - object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900 - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 7, 1, 1, 2, Route110_EventScript_1EF499, 0 - object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919 - object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0 - object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 7, 76, 3, 10, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0 - object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, 9, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0 - object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 36, 40, 3, 66, 1, 1, 1, 3, Route110_EventScript_1EF633, 0 - object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, 1, 1, 1, 0, 0, Route110_EventScript_290D8E, 1141 - object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, 1, 1, 1, 0, 0, 0x0, 837 + 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_OLD_WOMAN_1, 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_OLD_MAN_1, 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, 1007 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, 1006 + 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, 900 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900 + object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 900 + 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_HIPSTER, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, 919 + object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 922 + 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_WOMAN_2, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0 + object_event 32, EVENT_OBJ_GFX_MAN_3, 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_6, 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, 1141 + object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 837 Route110_MapWarps: @ 8529050 warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index adb59f580..4af135a6d 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 + 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 warp_def 1, 5, 0, 4, MAP_ROUTE110 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 5def6e102..3e9c99d55 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 + 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 warp_def 1, 5, 0, 2, MAP_ROUTE110 diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 12659457a..8348be5cb 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd_EventObjects: @ 853DEFC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899 Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index 30a6892df..d1083bb7f 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance_EventObjects: @ 853DE6C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872 Route110_TrickHouseEntrance_MapWarps: @ 853DE84 warp_def 5, 7, 3, 1, MAP_ROUTE110 diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index 05824aa38..38186f217 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -1,19 +1,19 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30 + 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, 19 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index a7259e3b3..2fa2f4bbc 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle2_EventObjects: @ 853E128 - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061 + 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, 1062 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 2f95cf052..986384ad4 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -1,11 +1,11 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22 + 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, 1064 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index b0dd3abf6..97022a3e0 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -1,18 +1,18 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26 + 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, 1065 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26 Route110_TrickHousePuzzle4_MapWarps: @ 853E488 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index 8da7daf11..0401ef544 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 + 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 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 7fc098f2c..75d64270b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067 + 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_6, 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, 1067 Route110_TrickHousePuzzle6_MapWarps: @ 853E730 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index e72aa929a..1d4373f25 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -1,13 +1,13 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068 - object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, 8, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, 7, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 - object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, 9, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 - object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, 1, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, 1, 1, 1, 0, 0, 0x0, 0 + 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, 1068 + 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: @ 853E840 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index eacc9e940..efeb449ff 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle8_EventObjects: @ 853E908 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 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, 1069 Route110_TrickHousePuzzle8_MapWarps: @ 853E968 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index cea2db8d5..b6aee76ac 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -1,50 +1,50 @@ Route111_EventObjects: @ 85291F0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771 - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 1, 1, 0, 0, Route111_EventScript_1F1189, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 2, 2, 1, 2, Route111_EventScript_1F1260, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010 - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0 - object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 1, 1, 0, 0, Route111_EventScript_2765FF, 960 - object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 1, 1, 0, 0, Route111_EventScript_1F1192, 0 - object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, 9, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0 - object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 132, 3, 10, 1, 1, 1, 5, Route111_EventScript_1F1410, 0 - object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, 7, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0 - object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 16, 119, 3, 10, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0 - object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, 14, 1, 1, 1, 7, Route111_EventScript_1F143E, 0 - object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, 10, 1, 1, 1, 6, Route111_EventScript_1F1427, 0 - object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, 9, 1, 1, 1, 7, Route111_EventScript_1F1455, 0 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, 1, 1, 1, 0, 0, Route111_EventScript_290DC2, 1142 - object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, 16, 1, 1, 0, 0, Route111_EventScript_1F119B, 0 - object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, 8, 1, 1, 0, 0, 0x0, 876 - object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, 8, 1, 1, 0, 0, 0x0, 875 - object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, 7, 1, 1, 0, 0, Route111_EventScript_1F11E4, 843 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 769 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 770 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 771 + 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_4, 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, 796 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 17 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 18 + 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, 1008 + 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, 799 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, 903 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, 903 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, 19 + 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_7, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0 + object_event 32, EVENT_OBJ_GFX_MAN_4, 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, 960 + object_event 34, EVENT_OBJ_GFX_MAN_5, 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_3, 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_6, 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, 1142 + 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, 876 + object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 875 + object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, 843 Route111_MapWarps: @ 8529640 warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc index 5ade76ba3..16f480460 100644 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ b/data/maps/Route111_OldLadysRestStop/events.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_EventObjects: @ 8533C18 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 Route111_OldLadysRestStop_MapWarps: @ 8533C30 warp_def 3, 7, 0, 2, MAP_ROUTE111 diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc index 0fe5b5df4..e2c0a2fa5 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc @@ -1,8 +1,8 @@ Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 + 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_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 warp_def 3, 7, 0, 0, MAP_ROUTE111 diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index 0e218cd78..7cf199eee 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,18 +1,18 @@ Route112_EventObjects: @ 8529974 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, 7, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011 - object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, 18, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 15, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819 + 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, 819 + 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, 1011 + object_event 13, EVENT_OBJ_GFX_MAN_6, 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_3, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 Route112_MapWarps: @ 8529AC4 warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc index 77f37d72c..2fe084697 100644 --- a/data/maps/Route112_CableCarStation/events.inc +++ b/data/maps/Route112_CableCarStation/events.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_EventObjects: @ 8533C54 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + 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 warp_def 6, 11, 0, 0, MAP_ROUTE112 diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 25287a747..23469ff17 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -1,20 +1,20 @@ Route113_EventObjects: @ 8529B2C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013 - object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, 1, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143 - object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, 9, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, 7, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 - object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, 26, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 7, 13, 3, 25, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 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_7, 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, 1012 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013 + object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 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, 1143 + 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_6, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 Route113_MapWarps: @ 8529CAC warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc index 1d5104e1c..352f1fabb 100644 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ b/data/maps/Route113_GlassWorkshop/events.inc @@ -1,6 +1,6 @@ Route113_GlassWorkshop_EventObjects: @ 853EA78 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 + 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_LITTLE_BOY_1, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 Route113_GlassWorkshop_MapWarps: @ 853EAA8 warp_def 3, 8, 0, 0, MAP_ROUTE113 diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 3e48c5721..1f25b59ca 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -1,31 +1,31 @@ Route114_EventObjects: @ 8529E68 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 0, 1, 0, 0, Route114_EventScript_1F2582, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 18 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 19 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 20 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 1, 1, 0, 0, Route114_EventScript_2907A6, 21 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 1, 1, 1, 1, Route114_EventScript_1F278E, 0 - object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, 7, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0 - object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, 18, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, 1, 1, 1, 0, 0, Route114_EventScript_290E1D, 1160 - object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, 17, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 + 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, 1014 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, 1015 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, 17 + 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_5, 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_6, 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, 18 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 19 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 20 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 21 + 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, 1160 + 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 warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index c947d9d8f..65864133e 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_EventObjects: @ 8533CFC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 Route114_FossilManiacsHouse_MapWarps: @ 8533D14 warp_def 4, 7, 0, 1, MAP_ROUTE114 diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index 99edadee1..ca6142852 100644 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 + 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 warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index 352bb2037..a6ecd2e7f 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_EventObjects: @ 8533DD4 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870 Route114_LanettesHouse_MapWarps: @ 8533DEC warp_def 5, 7, 0, 2, MAP_ROUTE114 diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 37d886e7f..29a77c6ce 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -1,27 +1,27 @@ Route115_EventObjects: @ 852A1BC - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 1, 1, 0, 0, Route115_EventScript_2907A6, 17 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E51, 1118 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, 46, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0 - object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, 57, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0 - object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, 9, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, 10, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0 - object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, 9, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, 1, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 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, 1016 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, 1017 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, 1018 + 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, 17 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, 1118 + 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_LITTLE_BOY_1, 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, 1161 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144 Route115_MapWarps: @ 852A3E4 warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 16afe4482..e2ba1ad15 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -1,32 +1,32 @@ Route116_EventObjects: @ 852A4B8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021 - object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 1, 1, 0, 0, Route116_EventScript_1F2CA2, 947 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, 1, 1, 1, 0, 0, Route116_EventScript_290E78, 1001 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813 - object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0 - object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, 1, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146 - object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, 1, 1, 1, 0, 0, Route116_EventScript_2906BB, 21 - object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, 18, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 - object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, 9, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 + 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, 17 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 18 + 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, 1019 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, 1020 + 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_OLD_MAN_1, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 19 + 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, 20 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021 + 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, 947 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, 1001 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813 + object_event 23, EVENT_OBJ_GFX_WOMAN_3, 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, 1146 + object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, 21 + 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 warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc index 8d133ab6d..896949ae8 100644 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ b/data/maps/Route116_TunnelersRestHouse/events.inc @@ -1,7 +1,7 @@ Route116_TunnelersRestHouse_EventObjects: @ 8533E34 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C warp_def 4, 8, 0, 1, MAP_ROUTE116 diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index f84ef6212..9747679ad 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -1,28 +1,28 @@ Route117_EventObjects: @ 852A828 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 25, 5, 3, 40, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0 - object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, 33, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, 10, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, 9, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 - object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, 28, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 + 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_2, 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_2, 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_3, 0, 8, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0 + object_event 10, EVENT_OBJ_GFX_MAN_5, 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, 1022 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, 17 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023 + 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: @ 852AA68 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc index 05220bdc9..a1a8e3673 100644 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ b/data/maps/Route117_PokemonDayCare/events.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_EventObjects: @ 8533EA0 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 Route117_PokemonDayCare_MapWarps: @ 8533EB8 warp_def 2, 8, 0, 0, MAP_ROUTE117 diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index 5e732890d..f49f07faa 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -1,25 +1,25 @@ Route118_EventObjects: @ 852AAB4 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, 2, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, 966 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121 - object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, 8, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 + 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_6, 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, 797 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, 797 + 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, 901 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, 904 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, 904 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, 17 + 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_3, 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_6, 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_6, 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, 966 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121 + 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 warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index bd10dc05b..c21f105e5 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -1,47 +1,47 @@ Route119_EventObjects: @ 852AD6C - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0 - object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0 - object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0 - object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0 - object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0 - object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851 - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890 - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890 - object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923 - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 2, 1, 0, 0, Route119_EventScript_1F476B, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 1, 1, 1, 3, Route119_EventScript_1F4930, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 1, 1, 0, 0, Route119_EventScript_27231C, 989 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, 76, 1, 1, 0, 0, Route119_EventScript_272329, 990 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 1, 1, 1, 0, Route119_EventScript_1F4947, 0 - object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 68, 3, 7, 1, 1, 1, 5, Route119_EventScript_1F498C, 0 - object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, 10, 1, 1, 1, 3, Route119_EventScript_1F4975, 0 - object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 32, 15, 3, 9, 1, 1, 1, 4, Route119_EventScript_1F495E, 0 - object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, 1, 1, 1, 0, 0, Route119_EventScript_291399, 1134 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, 1, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147 - object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786 + 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_LITTLE_BOY_1, 0, 28, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 1, Route119_EventScript_1F4902, 0 + object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0 + object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0 + object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0 + object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 851 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, 1025 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, 1027 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, 1028 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, 1029 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890 + object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 923 + 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, 1106 + 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_LITTLE_BOY_1, 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, 989 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, 990 + 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_3, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0 + object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0 + object_event 40, EVENT_OBJ_GFX_MAN_6, 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, 1134 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147 + object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 786 Route119_MapWarps: @ 852B174 warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc index 05d426fe5..ebae9a0fc 100644 --- a/data/maps/Route119_House/events.inc +++ b/data/maps/Route119_House/events.inc @@ -1,11 +1,11 @@ Route119_House_EventObjects: @ 853ECD0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 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: @ 853ED78 warp_def 3, 8, 0, 1, MAP_ROUTE119 diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index ee9f42ac5..c69d053ff 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 + 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, 890 + 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, 890 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 warp_def 9, 12, 0, 0, MAP_ROUTE119 diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc index 4196be41b..d3389f615 100644 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -1,12 +1,12 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893 - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, 9, 1, 1, 0, 0, 0x0, 992 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, 9, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890 + 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, 890 + 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, 890 + 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, 890 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893 + 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_5, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 992 + 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, 890 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index a19a70f33..fd79c716d 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -1,48 +1,48 @@ Route120_EventObjects: @ 852B3F8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0 - object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030 - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031 - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_290F62, 1107 - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_1F5641, 972 - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 20 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, Route120_EventScript_2906BB, 18 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 - object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_1F5953, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, 981 - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722DB, 982 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722E8, 985 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_2722F5, 986 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_27230F, 988 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_272302, 987 - object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, 7, 1, 1, 1, 3, Route120_EventScript_1F5981, 0 - object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, 10, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 - object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, 1, 1, 1, 0, 0, Route120_EventScript_290F7C, 1148 + 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_6, 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_6, 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, 1030 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, 798 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, 798 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, 902 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, 902 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, 17 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, 1031 + 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_7, 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_7, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 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, 1108 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, 1107 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, 972 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 20 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 18 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 + object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 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, 981 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, 982 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, 985 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, 986 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, 988 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, 987 + 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_4, 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, 1148 Route120_MapWarps: @ 852B818 warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 17ddae47f..7cafdc402 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -1,33 +1,33 @@ Route121_EventObjects: @ 852BA14 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18 - object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F89, 1103 - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, Route121_EventScript_2906BB, 19 - object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, 26, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 - object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, 8, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 - object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, 7, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 - object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, 18, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, 17, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_290F96, 1149 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, 1, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 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, 914 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 914 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 914 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 17 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 18 + object_event 17, EVENT_OBJ_GFX_WOMAN_2, 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, 1103 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, 19 + 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_5, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 + object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 + object_event 26, EVENT_OBJ_GFX_MAN_4, 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_7, 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, 1149 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150 Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 2d8351534..8ac15b503 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -1,7 +1,7 @@ Route121_SafariZoneEntrance_EventObjects: @ 8533EDC - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + 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 warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index 0fc1b015b..7fafbb76a 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -1,47 +1,47 @@ Route123_EventObjects: @ 852BDBC - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032 - object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0 - object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0 - object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0 - object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0 - object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0 - object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0 - object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104 - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, 57, 1, 1, 1, 1, Route123_EventScript_1F6377, 0 - object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, 7, 1, 1, 1, 1, Route123_EventScript_1F6360, 0 - object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, 7, 1, 1, 1, 4, Route123_EventScript_1F6349, 0 - object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, 8, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0 - object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F6332, 0 - object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, 7, 1, 1, 1, 2, Route123_EventScript_1F631B, 0 - object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152 - object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, 7, 1, 1, 1, 3, Route123_EventScript_1F638E, 0 - object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, 26, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 - object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, 1, 1, 1, 0, 0, Route123_EventScript_290FE4, 1153 + 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_7, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 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, 17 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 18 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 19 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032 + 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_3, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0 + object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0 + object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 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, 1104 + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0 + object_event 35, EVENT_OBJ_GFX_WOMAN_3, 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_6, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0 + object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 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, 1152 + object_event 41, EVENT_OBJ_GFX_WOMAN_7, 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, 1153 Route123_MapWarps: @ 852C1C4 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc index 3f4725870..c848f341b 100644 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ b/data/maps/Route123_BerryMastersHouse/events.inc @@ -1,6 +1,6 @@ Route123_BerryMastersHouse_EventObjects: @ 853EACC - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 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_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 Route123_BerryMastersHouse_MapWarps: @ 853EAFC warp_def 3, 7, 0, 0, MAP_ROUTE123 diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 2dc839783..3e4ab2780 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,16 +1,16 @@ Route124_EventObjects: @ 852C3C4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, 67, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, 18, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_29100B, 1066 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 - object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, 7, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 - object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, 66, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 + 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, 1092 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, 1066 + 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: @ 852C4E4 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index 606138e38..5294f6d71 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 warp_def 3, 8, 0, 0, MAP_ROUTE124 diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index b767e512d..cb13b81fa 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -1,14 +1,14 @@ Route125_EventObjects: @ 852C50C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, 10, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, 52, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F6862, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F687D, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, 28, 2, 1, 1, 3, Route125_EventScript_1F6898, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, 27, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, 1, 1, 1, 0, 0, Route125_EventScript_291018, 1154 + 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_6, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 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, 1154 Route125_MapWarps: @ 852C5FC warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc index cf87bb74e..0c3180a79 100644 --- a/data/maps/Route126/events.inc +++ b/data/maps/Route126/events.inc @@ -1,13 +1,13 @@ Route126_EventObjects: @ 852C648 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, 51, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 1, 1, 0, 0, Route126_EventScript_291025, 1105 - object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, 66, 1, 1, 1, 7, Route126_EventScript_1F6960, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, 67, 1, 1, 1, 7, Route126_EventScript_1F6977, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, 66, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, 67, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 + 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, 1105 + 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:: @ 852C720 map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index b7c378a96..8f5fffa71 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -1,15 +1,15 @@ Route127_EventObjects: @ 852C734 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, 9, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, 7, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, 9, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, 10, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155 + 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, 1034 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, 1035 + 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_6, 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_7, 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, 1155 Route127_MapBGEvents: @ 852C83C bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index c34f6eb16..c4b1710fa 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -1,14 +1,14 @@ Route128_EventObjects: @ 852C88C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, 48, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834 - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, 944 - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, 945 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, 17, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, 25, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 - object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, 26, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 + 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, 834 + object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 944 + object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 945 + 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_4, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 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: @ 852C97C bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc index 7c1425ebe..c127ec5e3 100644 --- a/data/maps/Route129/events.inc +++ b/data/maps/Route129/events.inc @@ -1,9 +1,9 @@ Route129_EventObjects: @ 852C9B4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 50, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, 52, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, 64, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, 24, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, 65, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 + 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 map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index ad1429553..227e359b6 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,8 +1,8 @@ Route130_EventObjects: @ 852CA40 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, 51, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, 26, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, 25, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 + 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, 17 + 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 map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc index 2bb2c5cbc..1c321a6cb 100644 --- a/data/maps/Route131/events.inc +++ b/data/maps/Route131/events.inc @@ -1,12 +1,12 @@ Route131_EventObjects: @ 852CAB4 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, 29, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, 22, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, 47, 3, 5, 1, 3, Route131_EventScript_1F746E, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 1, 1, 1, 1, Route131_EventScript_1F7485, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, 26, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, 25, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 + 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: @ 852CB74 warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc index 19ff5ccc8..7d62fb306 100644 --- a/data/maps/Route132/events.inc +++ b/data/maps/Route132/events.inc @@ -1,14 +1,14 @@ Route132_EventObjects: @ 852CB90 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, 46, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, 45, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 - object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, 8, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, 25, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, 7, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, 26, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, 1, 1, 1, 0, 0, Route132_EventScript_291066, 1156 + 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, 1036 + 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_OLD_MAN_1, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 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, 1156 Route132_MapEvents:: @ 852CC80 map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index 6adfce330..ba1ac2ac0 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -1,14 +1,14 @@ Route133_EventObjects: @ 852CC94 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, 25, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, 26, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038 - object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, 18, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, 8, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, 16, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, 1, 1, 1, 0, 0, Route133_EventScript_29108D, 1157 + 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, 1037 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, 1038 + object_event 6, EVENT_OBJ_GFX_MAN_6, 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_4, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 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, 1157 Route133_MapEvents:: @ 852CD84 map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 5a2d57417..03339b081 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -1,15 +1,15 @@ Route134_EventObjects: @ 852CD98 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, 26, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, 9, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 - object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, 25, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 - object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, 18, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, 1, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, 1, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 + 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_4, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 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_7, 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, 1158 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index b71bdb875..4c70edf34 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -1,20 +1,20 @@ RustboroCity_EventObjects: @ 85267E0 - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731 - object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041 - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 - object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814 - object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, 1, 1, 1, 0, 0, 0x0, 844 - object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, 1, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 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_LITTLE_BOY_1, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 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_4, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 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, 732 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 731 + object_event 11, EVENT_OBJ_GFX_MAN_7, 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, 1041 + object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 + object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814 + object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 844 + 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 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc index db9b6f56d..6657c9305 100644 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ b/data/maps/RustboroCity_CuttersHouse/events.inc @@ -1,6 +1,6 @@ RustboroCity_CuttersHouse_EventObjects: @ 8530A1C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 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 warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index c6d4048c4..260d64a0d 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_1F_EventObjects: @ 853037C - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 - object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 + object_event 2, EVENT_OBJ_GFX_MAN_7, 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_4, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index 31a3d1de6..f10c94780 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -1,10 +1,10 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 + 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: @ 8530498 warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index 8db3c085c..0c655b814 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 + 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, 949 + 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 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc index 1f2ae85fd..d52b495eb 100644 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ b/data/maps/RustboroCity_Flat1_1F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_1F_EventObjects: @ 8530890 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 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_7, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 RustboroCity_Flat1_1F_MapWarps: @ 85308C0 warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc index 647e7a437..13ebbbc0d 100644 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ b/data/maps/RustboroCity_Flat1_2F/events.inc @@ -1,12 +1,12 @@ RustboroCity_Flat1_2F_EventObjects: @ 85308EC - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 6, 3, 5, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 5, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, 10, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0 - object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, 1, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 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_LITTLE_GIRL_1, 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: @ 85309AC warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc index 392f5b1fa..16c79649a 100644 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ b/data/maps/RustboroCity_Flat2_1F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 + 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_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc index 9914eed3c..559c6e6e0 100644 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ b/data/maps/RustboroCity_Flat2_2F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_2F_EventObjects: @ 8530B20 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 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 warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc index 4a67fdc47..71d03ddb1 100644 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ b/data/maps/RustboroCity_Flat2_3F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_3F_EventObjects: @ 8530B74 - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 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 warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 193c41685..8d6971796 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -1,9 +1,9 @@ RustboroCity_Gym_EventObjects: @ 8530538 - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, 8, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 + 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 warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc index 1d2b2d0b7..2fc0284a9 100644 --- a/data/maps/RustboroCity_House1/events.inc +++ b/data/maps/RustboroCity_House1/events.inc @@ -1,6 +1,6 @@ RustboroCity_House1_EventObjects: @ 85309C8 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 + 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 warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc index 3a4e5e15e..5c5ab205e 100644 --- a/data/maps/RustboroCity_House2/events.inc +++ b/data/maps/RustboroCity_House2/events.inc @@ -1,6 +1,6 @@ RustboroCity_House2_EventObjects: @ 8530A70 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 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_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 RustboroCity_House2_MapWarps: @ 8530AA0 warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc index 07234fc2e..2fc6a6233 100644 --- a/data/maps/RustboroCity_House3/events.inc +++ b/data/maps/RustboroCity_House3/events.inc @@ -1,7 +1,7 @@ RustboroCity_House3_EventObjects: @ 8530BC0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 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_2, 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 warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc index 038d13bf7..683ed5ff7 100644 --- a/data/maps/RustboroCity_Mart/events.inc +++ b/data/maps/RustboroCity_Mart/events.inc @@ -1,8 +1,8 @@ RustboroCity_Mart_EventObjects: @ 853080C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 + 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_WOMAN_2, 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 warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc index e2945f435..597eace15 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 + 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 warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index d1ec1adb9..f1f9fe356 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 2deabdb5c..0fdcca3c8 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -1,11 +1,11 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, 7, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 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, 999 RustboroCity_PokemonSchool_MapWarps: @ 8530694 warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index e294e200e..c56a5b5ee 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -1,14 +1,14 @@ RusturfTunnel_EventObjects: @ 85341C4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 879 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932 + 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_3, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, 983 RusturfTunnel_MapWarps: @ 85342B4 warp_def 4, 10, 3, 0, MAP_ROUTE116 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index 8f0b1de77..22827aca3 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,9 +1,9 @@ SSTidalCorridor_EventObjects: @ 853A158 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810 + 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_OLD_MAN_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 810 SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index 969830d37..9722e1df1 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -1,6 +1,6 @@ SSTidalLowerDeck_EventObjects: @ 853A2BC - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 + 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 warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index a9900294c..0e038f0f9 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -1,12 +1,12 @@ SSTidalRooms_EventObjects: @ 853A314 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 - object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, 951 + object_event 1, EVENT_OBJ_GFX_MAN_3, 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_5, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 + object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 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, 951 SSTidalRooms_MapWarps: @ 853A3D4 warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc index 88b41669b..1057b4ecd 100644 --- a/data/maps/SafariZone_North/events.inc +++ b/data/maps/SafariZone_North/events.inc @@ -1,13 +1,13 @@ SafariZone_North_EventObjects: @ 853B160 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 17 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 20 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 21 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 22 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, 1119 + 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_5, 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, 17 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 20 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 21 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 22 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, 1119 SafariZone_North_MapEvents:: @ 853B238 map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index e71ba4dd5..38f59ff13 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -1,13 +1,13 @@ SafariZone_Northeast_EventObjects: @ 853B968 - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 + 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, 21 + 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, 19 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 SafariZone_Northeast_MapBGEvents: @ 853BA40 bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0 diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc index 8e5b242b9..c43db4125 100644 --- a/data/maps/SafariZone_Northwest/events.inc +++ b/data/maps/SafariZone_Northwest/events.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_EventObjects: @ 853B11C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094 + 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, 1094 SafariZone_Northwest_MapEvents:: @ 853B14C map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc index 0607ffcc7..5a54de961 100644 --- a/data/maps/SafariZone_RestHouse/events.inc +++ b/data/maps/SafariZone_RestHouse/events.inc @@ -1,7 +1,7 @@ SafariZone_RestHouse_EventObjects: @ 853B8FC - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 + 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 warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc index 46173d11a..01a016f02 100644 --- a/data/maps/SafariZone_South/events.inc +++ b/data/maps/SafariZone_South/events.inc @@ -1,10 +1,10 @@ SafariZone_South_EventObjects: @ 853B2A4 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, 9, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, 717 - object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, 9, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, 717 + 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_5, 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, 717 + object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, 717 SafariZone_South_MapWarps: @ 853B334 warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index af2da0575..f7f38f7af 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -1,9 +1,9 @@ SafariZone_Southeast_EventObjects: @ 853BA6C - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 7, 7, 3, 1, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 8, 26, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, 1, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, 9, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 + object_event 1, EVENT_OBJ_GFX_BOY_4, 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_2, 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, 1170 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 SafariZone_Southeast_MapBGEvents: @ 853BAE4 bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0 diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index ccd775dd2..886958342 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_EventObjects: @ 853B24C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 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, 1131 SafariZone_Southwest_MapWarps: @ 853B27C warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc index 588b7a9ae..5bbe88c20 100644 --- a/data/maps/ScorchedSlab/events.inc +++ b/data/maps/ScorchedSlab/events.inc @@ -1,5 +1,5 @@ ScorchedSlab_EventObjects: @ 8536F88 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079 ScorchedSlab_MapWarps: @ 8536FA0 warp_def 7, 16, 1, 1, MAP_ROUTE120 diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc index e27362f00..11a8211de 100644 --- a/data/maps/SeafloorCavern_Entrance/events.inc +++ b/data/maps/SeafloorCavern_Entrance/events.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_EventObjects: @ 85356BC - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, 7, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941 + 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, 941 SeafloorCavern_Entrance_MapWarps: @ 85356D4 warp_def 10, 18, 3, 0, MAP_UNDERWATER4 diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc index 261314b9b..2c8e51e30 100644 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room1_EventObjects: @ 85356F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, 1, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, 16, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19 + 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, 946 + 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, 946 SeafloorCavern_Room1_MapWarps: @ 8535770 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc index 01f6f3ba5..82f924121 100644 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -1,12 +1,12 @@ SeafloorCavern_Room2_EventObjects: @ 853579C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23 SeafloorCavern_Room2_MapWarps: @ 853585C warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc index 300db40c5..9a1399705 100644 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, 9, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, 10, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25 + 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, 946 + 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, 946 SeafloorCavern_Room3_MapWarps: @ 8535968 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc index 6b6df78f2..e67cb0d5b 100644 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room4_EventObjects: @ 8535994 - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, 17, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, 7, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946 + 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, 946 + 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, 946 SeafloorCavern_Room4_MapWarps: @ 85359C4 warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc index 97787ebbf..f0c69175b 100644 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20 SeafloorCavern_Room5_MapWarps: @ 8535A88 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc index 42dcf9faa..d69b12f7e 100644 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28 SeafloorCavern_Room8_MapWarps: @ 8535C24 warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index ac3337bed..659ca8b03 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828 - object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829 - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090 - object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, 8, 1, 1, 0, 0, 0x0, 733 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 859 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 828 + object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 829 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090 + object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 733 SeafloorCavern_Room9_MapWarps: @ 8535CF0 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc index 2905764cf..606999612 100644 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC - object_event 1, 255, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_BlueCave1_MapWarps: @ 8537D54 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc index 8202b7a42..0991d03e2 100644 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 - object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_BlueCave2_MapWarps: @ 853866C warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc index 733b674b7..e0bd13a3b 100644 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C - object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_BlueCave3_MapWarps: @ 8538F84 warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc index afd1622b8..15266e18b 100644 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 - object_event 1, 255, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_BlueCave4_MapWarps: @ 853989C warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc index e4fffab49..8c2771f4e 100644 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 - object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_BrownCave1_MapWarps: @ 8537BD0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc index 29e90b592..f5e168e36 100644 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 - object_event 1, 255, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_BrownCave2_MapWarps: @ 85384E8 warp_def 1, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc index 3322b9d5a..c41147bc6 100644 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 - object_event 1, 255, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_BrownCave3_MapWarps: @ 8538E00 warp_def 11, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc index 310033947..40d00597e 100644 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 - object_event 1, 255, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_BrownCave4_MapWarps: @ 8539718 warp_def 2, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc index eba992586..1b5f202cf 100644 --- a/data/maps/SecretBase_RedCave1/events.inc +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 - object_event 1, 255, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_RedCave1_MapWarps: @ 8537A4C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc index c6f534965..d84f297a2 100644 --- a/data/maps/SecretBase_RedCave2/events.inc +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave2_EventObjects: @ 85381FC - object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_RedCave2_MapWarps: @ 8538364 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc index dda054b44..f288371e8 100644 --- a/data/maps/SecretBase_RedCave3/events.inc +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 - object_event 1, 255, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_RedCave3_MapWarps: @ 8538C7C warp_def 3, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc index 54e33dc3d..9090f940e 100644 --- a/data/maps/SecretBase_RedCave4/events.inc +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave4_EventObjects: @ 853942C - object_event 1, 255, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_RedCave4_MapWarps: @ 8539594 warp_def 2, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc index acdac9692..aa886a0aa 100644 --- a/data/maps/SecretBase_Shrub1/events.inc +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub1_EventObjects: @ 8538078 - object_event 1, 255, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Shrub1_MapWarps: @ 85381E0 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc index a370d2e72..1acb5d0a1 100644 --- a/data/maps/SecretBase_Shrub2/events.inc +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub2_EventObjects: @ 8538990 - object_event 1, 255, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Shrub2_MapWarps: @ 8538AF8 warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc index 942be3617..7902f3fc7 100644 --- a/data/maps/SecretBase_Shrub3/events.inc +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 - object_event 1, 255, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Shrub3_MapWarps: @ 8539410 warp_def 6, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc index a027b266b..c6d5f32f5 100644 --- a/data/maps/SecretBase_Shrub4/events.inc +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 - object_event 1, 255, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Shrub4_MapWarps: @ 8539D28 warp_def 11, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc index 3379e8ecb..593fb5dbb 100644 --- a/data/maps/SecretBase_Tree1/events.inc +++ b/data/maps/SecretBase_Tree1/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 - object_event 1, 255, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Tree1_MapWarps: @ 853805C warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc index e330951cf..189911755 100644 --- a/data/maps/SecretBase_Tree2/events.inc +++ b/data/maps/SecretBase_Tree2/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree2_EventObjects: @ 853880C - object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Tree2_MapWarps: @ 8538974 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc index b4a8c2eb3..b2d950a40 100644 --- a/data/maps/SecretBase_Tree3/events.inc +++ b/data/maps/SecretBase_Tree3/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree3_EventObjects: @ 8539124 - object_event 1, 255, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Tree3_MapWarps: @ 853928C warp_def 8, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc index 4c57fcdfd..a1d7f7b50 100644 --- a/data/maps/SecretBase_Tree4/events.inc +++ b/data/maps/SecretBase_Tree4/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree4_EventObjects: @ 8539A3C - object_event 1, 255, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_Tree4_MapWarps: @ 8539BA4 warp_def 7, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc index e7f4ed7ce..9b394350c 100644 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 - object_event 1, 255, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_YellowCave1_MapWarps: @ 8537ED8 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc index 84aabf3d4..a958fcb53 100644 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 - object_event 1, 255, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_YellowCave2_MapWarps: @ 85387F0 warp_def 12, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc index 2e1d61708..2decabcee 100644 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 - object_event 1, 255, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_YellowCave3_MapWarps: @ 8539108 warp_def 5, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc index 07ac363ac..535ca8e4c 100644 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 - object_event 1, 255, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175 - object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176 - object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178 - object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179 - object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180 - object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181 - object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182 - object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183 - object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184 - object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185 - object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186 - object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187 + object_event 1, 255, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179 + object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180 + object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181 + object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182 + object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183 + object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184 + object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185 + object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186 + object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187 SecretBase_YellowCave4_MapWarps: @ 8539A20 warp_def 6, 12, 0, 126, MAP_NONE diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc index 1f4a008e3..614c009c1 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC warp_def 20, 30, 3, 0, MAP_ROUTE125 diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc index 57922e322..5f4fe1dac 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index f1d894264..5743c8c22 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index d3d656452..8b0cc9b40 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17 + 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 warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index 875f337a5..b9e6955ae 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index 4ef0de89f..6971d4217 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -1,5 +1,5 @@ SingleBattleColosseum_EventObjects: @ 8539D44 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 6, 8, 3, 127, MAP_NONE diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc index 4fb4cc010..386ea0b35 100644 --- a/data/maps/SkyPillar_Outside/events.inc +++ b/data/maps/SkyPillar_Outside/events.inc @@ -1,5 +1,5 @@ SkyPillar_Outside_EventObjects: @ 853701C - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, 8, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855 SkyPillar_Outside_MapWarps: @ 8537034 warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index 26bccf67f..79973b316 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -1,6 +1,6 @@ SkyPillar_Top_EventObjects: @ 8537170 - object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, 8, 1, 1, 0, 0, 0x0, 773 - object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, 8, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, 80 + object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 773 + object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, 80 SkyPillar_Top_MapWarps: @ 85371A0 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index b8480dfb6..3b72a57f3 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -1,39 +1,39 @@ SlateportCity_EventObjects: @ 85261CC - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 5, 13, 3, 2, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835 - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840 - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0 - object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0 - object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 - object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882 - object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882 - object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 - object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 - object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, 948 - object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, 882 - object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882 - object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882 - object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, 882 - object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, 882 - object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882 - object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882 - object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882 - object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 37, 3, 9, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 - object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, 8, 1, 2, 0, 0, 0x0, 749 + 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_BOY_4, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 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, 882 + 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_2, 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, 835 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835 + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840 + 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_WOMAN_2, 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_4, 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_7, 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, 882 + object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882 + 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_6, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_7, 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, 948 + object_event 25, EVENT_OBJ_GFX_MAN_3, 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, 882 + object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882 + object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882 + object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, 882 + object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, 882 + object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882 + object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882 + object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882 + object_event 34, EVENT_OBJ_GFX_WOMAN_2, 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, 749 SlateportCity_MapWarps: @ 8526514 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc index ce13a5899..6c28d5fc5 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc @@ -1,7 +1,7 @@ SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, 10, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, 7, 1, 1, 0, 0, 0x0, 0 + 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_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc index b56b50a0e..4fe072b50 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/events.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/events.inc @@ -1,5 +1,5 @@ SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0 + 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 map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc index 0ceca119b..d0875ba78 100644 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ b/data/maps/SlateportCity_BattleTentLobby/events.inc @@ -1,9 +1,9 @@ SlateportCity_BattleTentLobby_EventObjects: @ 852F408 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 8, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, 2, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 3, 7, 3, 7, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, 1, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 8, 3, 9, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 + 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_4, 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_3, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 SlateportCity_BattleTentLobby_MapWarps: @ 852F480 warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index af274e22f..5f6e2617f 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -1,12 +1,12 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841 - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845 - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846 - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841 + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 860 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 845 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 846 + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 848 SlateportCity_Harbor_MapWarps: @ 852FB28 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc index 493bb2922..713ff1dd5 100644 --- a/data/maps/SlateportCity_House1/events.inc +++ b/data/maps/SlateportCity_House1/events.inc @@ -1,5 +1,5 @@ SlateportCity_House1_EventObjects: @ 852F538 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 SlateportCity_House1_MapWarps: @ 852F550 warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc index 42d0e3660..daa627c06 100644 --- a/data/maps/SlateportCity_House2/events.inc +++ b/data/maps/SlateportCity_House2/events.inc @@ -1,6 +1,6 @@ SlateportCity_House2_EventObjects: @ 852FB9C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 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 warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc index d6391598e..da5f668e0 100644 --- a/data/maps/SlateportCity_Mart/events.inc +++ b/data/maps/SlateportCity_Mart/events.inc @@ -1,7 +1,7 @@ SlateportCity_Mart_EventObjects: @ 852FCF0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 + 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_4, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 SlateportCity_Mart_MapWarps: @ 852FD38 warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index cfe385a3c..aca75a698 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -1,18 +1,18 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883 - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883 - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883 - object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961 - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961 - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, 21, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965 - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961 + 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, 883 + 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, 883 + 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, 883 + 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, 883 + 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, 883 + 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, 883 + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961 + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961 + 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, 965 + 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, 961 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index dc0c8a8d9..9c695f745 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -1,11 +1,11 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961 + 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, 887 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 886 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 884 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 885 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc index f59413aba..32328d255 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 + 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_7, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc index f59512311..e20e593cb 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc index 92974f5b4..d6a0ac4e1 100644 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc @@ -1,13 +1,13 @@ SlateportCity_PokemonFanClub_EventObjects: @ 852F574 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 - object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 11, 8, 0, 9, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 + 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_LITTLE_GIRL_1, 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_5, 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_5, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc index b231f9816..19886500f 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -1,8 +1,8 @@ SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869 + 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_OLD_MAN_1, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc index 450f40fe7..f34a52726 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc @@ -1,7 +1,7 @@ SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 + 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 warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 96aaefd9c..b7d481ac3 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -1,22 +1,22 @@ SootopolisCity_EventObjects: @ 8527314 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839 - object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0 - object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, 80, 1, 1, 0, 0, 0x0, 998 - object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, 79, 1, 1, 0, 0, 0x0, 997 - object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, 10, 1, 1, 0, 0, 0x0, 996 - object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, 854 - object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, 854 - object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, 854 - object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, 854 - object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, 827 - object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, 826 - object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, 8, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, 816 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854 + 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_LITTLE_BOY_1, 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, 839 + object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 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, 998 + object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, 997 + object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 996 + object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, 854 + object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, 854 + object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, 854 + object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, 854 + object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, 827 + object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, 826 + object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, 816 SootopolisCity_MapWarps: @ 85274C4 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index 925acc34b..ee78e053a 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -1,6 +1,6 @@ SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 - object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 + 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 warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc index 1ed20fc94..9f747bc4a 100644 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc @@ -1,14 +1,14 @@ SootopolisCity_Gym_B1F_EventObjects: @ 8533068 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 13, 3, 10, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, 9, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 + 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_3, 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_WOMAN_2, 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_3, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 SootopolisCity_Gym_B1F_MapWarps: @ 8533158 warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc index 4ddbd23ea..38885d648 100644 --- a/data/maps/SootopolisCity_House1/events.inc +++ b/data/maps/SootopolisCity_House1/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House1_EventObjects: @ 85332F8 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 + 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 warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc index 213fe39d3..a8885190e 100644 --- a/data/maps/SootopolisCity_House2/events.inc +++ b/data/maps/SootopolisCity_House2/events.inc @@ -1,5 +1,5 @@ SootopolisCity_House2_EventObjects: @ 853334C - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 SootopolisCity_House2_MapWarps: @ 8533364 warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc index 0feca97cb..9f5cc781e 100644 --- a/data/maps/SootopolisCity_House3/events.inc +++ b/data/maps/SootopolisCity_House3/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House3_EventObjects: @ 8533388 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 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 warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc index 1f14ba6e9..d9948d5be 100644 --- a/data/maps/SootopolisCity_House4/events.inc +++ b/data/maps/SootopolisCity_House4/events.inc @@ -1,7 +1,7 @@ SootopolisCity_House4_EventObjects: @ 85333DC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 + 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_5, 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 warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc index 566631c02..321de8b64 100644 --- a/data/maps/SootopolisCity_House5/events.inc +++ b/data/maps/SootopolisCity_House5/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House5_EventObjects: @ 8533448 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 + 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 warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc index a85356317..4ca7e5745 100644 --- a/data/maps/SootopolisCity_House6/events.inc +++ b/data/maps/SootopolisCity_House6/events.inc @@ -1,5 +1,5 @@ SootopolisCity_House6_EventObjects: @ 853349C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 SootopolisCity_House6_MapWarps: @ 85334B4 warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc index 65b0cf9dd..76a198f6e 100644 --- a/data/maps/SootopolisCity_House7/events.inc +++ b/data/maps/SootopolisCity_House7/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House7_EventObjects: @ 85334D8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 SootopolisCity_House7_MapWarps: @ 8533508 warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc index 84e642bac..8d0512952 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc @@ -1,6 +1,6 @@ SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 + 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 warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc index 0c32cb482..32fc081d2 100644 --- a/data/maps/SootopolisCity_Mart/events.inc +++ b/data/maps/SootopolisCity_Mart/events.inc @@ -1,7 +1,7 @@ SootopolisCity_Mart_EventObjects: @ 853328C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 + 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 warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc index bf06c2cd9..4eb796671 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc index 21ea255a4..39b3366c5 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 0, 9, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc index 9bca02a56..4ca22d1f8 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 + 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_7, 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 warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc index 8498f9de2..f9e4626ea 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index 69cddf603..d204708db 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -1,6 +1,6 @@ SouthernIsland_Exterior_EventObjects: @ 853B83C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0 + 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 warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index c31a5568b..55bfeb614 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_EventObjects: @ 853B89C - object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910 - object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 910 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 911 SouthernIsland_Interior_MapWarps: @ 853B8CC warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc index 61edb1e28..b47a00441 100644 --- a/data/maps/TerraCave_End/events.inc +++ b/data/maps/TerraCave_End/events.inc @@ -1,5 +1,5 @@ TerraCave_End_EventObjects: @ 8537850 - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, 8, 1, 1, 0, 0, 0x0, 783 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 783 TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index 89e5eac90..a2156ff48 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -1,5 +1,5 @@ TradeCenter_EventObjects: @ 8539DA0 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 TradeCenter_MapWarps: @ 8539DB8 warp_def 5, 8, 3, 127, MAP_NONE diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc index 7af4c5425..0125c9936 100644 --- a/data/maps/TrainerHill_Elevator/events.inc +++ b/data/maps/TrainerHill_Elevator/events.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator_EventObjects: @ 853DD84 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, 8, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 + 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 warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc index 4b974ce9b..8cb0b43b9 100644 --- a/data/maps/TrainerHill_Entrance/events.inc +++ b/data/maps/TrainerHill_Entrance/events.inc @@ -1,9 +1,9 @@ TrainerHill_Entrance_EventObjects: @ 853D874 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, 9, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 - object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, 8, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, 8, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, 2, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 - object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 14, 15, 3, 2, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 + 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_4, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 TrainerHill_Entrance_MapWarps: @ 853D8EC warp_def 9, 16, 3, 4, MAP_ROUTE111 diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc index c322d7e96..eeab57317 100644 --- a/data/maps/TrainerHill_Roof/events.inc +++ b/data/maps/TrainerHill_Roof/events.inc @@ -1,5 +1,5 @@ TrainerHill_Roof_EventObjects: @ 853D9C4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, 8, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 + 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 warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc index a22465ca0..fbad57bc8 100644 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -1,8 +1,8 @@ Underwater_SeafloorCavern_EventObjects: @ 8535640 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980 Underwater_SeafloorCavern_MapWarps: @ 85356A0 warp_def 6, 7, 0, 0, MAP_UNDERWATER4 diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc index 1a50ea7d8..3396b5b8b 100644 --- a/data/maps/UnionRoom/events.inc +++ b/data/maps/UnionRoom/events.inc @@ -1,13 +1,13 @@ UnionRoom_EventObjects: @ 853B020 - object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 - object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706 - object_event 3, 247, 0, 7, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710 - object_event 4, 246, 0, 1, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709 - object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708 - object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707 - object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705 - object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704 - object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, 703 + 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_GIDDY, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706 + object_event 3, 247, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710 + object_event 4, 246, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709 + object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707 + object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704 + object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, 703 UnionRoom_MapWarps: @ 853B0F8 warp_def 7, 11, 3, 127, MAP_NONE diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index c844cfa1a..0a871136f 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_EventObjects: @ 8527CDC - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, 3, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 + 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_LITTLE_GIRL_1, 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 warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc index 6276192b3..616c0db5e 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc @@ -1,7 +1,7 @@ VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734 - object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, 7, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, 8, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, 10, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc index 4fa836d58..c66173836 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 6, 3, 7, 1, 1, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720 map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc index 570e600fe..4b9b254a8 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc @@ -1,10 +1,10 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 5, 3, 8, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, 2, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, 10, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, 9, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, 9, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 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, 766 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc index fd5fa0292..fa3e09561 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc @@ -1,6 +1,6 @@ VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 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 warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc index 49b8d47ee..5de382052 100644 --- a/data/maps/VerdanturfTown_House/events.inc +++ b/data/maps/VerdanturfTown_House/events.inc @@ -1,6 +1,6 @@ VerdanturfTown_House_EventObjects: @ 852EA1C - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 VerdanturfTown_House_MapWarps: @ 852EA4C warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc index 804f39647..5bdbce786 100644 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ b/data/maps/VerdanturfTown_Mart/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_Mart_EventObjects: @ 852E790 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 + 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_OLD_WOMAN_1, 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 warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc index 77bd6748c..3faee7bda 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 + 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_OLD_MAN_1, 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_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc index 40cbe6aec..6aa0d681a 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702 + 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, 702 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc index cfa46e102..e55967bd7 100644 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -1,9 +1,9 @@ VerdanturfTown_WandasHouse_EventObjects: @ 852E92C - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984 + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index d5fa881dc..0c94c31a2 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -1,13 +1,13 @@ VictoryRoad_1F_EventObjects: @ 8535E04 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, 8, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085 - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, 10, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, 9, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 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, 858 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 VictoryRoad_1F_MapWarps: @ 8535EDC warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc index 26d67171d..f96b0d4bc 100644 --- a/data/maps/VictoryRoad_B1F/events.inc +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -1,25 +1,25 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26 - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28 - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31 - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087 - object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, 8, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 - object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, 16, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28 + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31 + object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_7, 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, 21 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087 + object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 + object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 VictoryRoad_B1F_MapWarps: @ 853613C warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index a25c76c81..ca7719bd7 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -1,11 +1,11 @@ VictoryRoad_B2F_EventObjects: @ 8536188 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088 - object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, 7, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 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, 1088 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F -- cgit v1.2.3 From 7d375972ba0e5a8a17fecbd223dd6de6e87b6090 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 11 Jul 2018 11:12:26 -0500 Subject: Sync bg_event macros with pokeruby --- asm/macros/map.inc | 29 ++++-- data/map_events.s | 3 + data/maps/AbandonedShip_Corridors_B1F/events.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors/events.inc | 8 +- .../maps/AbandonedShip_HiddenFloorRooms/events.inc | 20 ++-- data/maps/AncientTomb/events.inc | 6 +- data/maps/AquaHideout_B2F/events.inc | 4 +- data/maps/ArtisanCave_B1F/events.inc | 8 +- .../BattleFrontier_BattleArenaLobby/events.inc | 4 +- .../maps/BattleFrontier_BattleDomeLobby/events.inc | 8 +- .../BattleFrontier_BattleFactoryLobby/events.inc | 6 +- .../BattleFrontier_BattlePalaceLobby/events.inc | 6 +- .../maps/BattleFrontier_BattlePikeLobby/events.inc | 4 +- .../events.inc | 14 +-- .../events.inc | 14 +-- .../events.inc | 18 ++-- .../BattleFrontier_BattlePyramidLobby/events.inc | 4 +- .../BattleFrontier_BattlePyramidTop/events.inc | 2 +- .../BattleFrontier_BattleTowerLobby/events.inc | 10 +- data/maps/BattleFrontier_OutsideEast/events.inc | 16 +-- data/maps/BattleFrontier_OutsideWest/events.inc | 10 +- data/maps/BattleFrontier_RankingHall/events.inc | 24 ++--- data/maps/DesertRuins/events.inc | 6 +- data/maps/DewfordTown/events.inc | 10 +- data/maps/DewfordTown_Gym/events.inc | 8 +- data/maps/DewfordTown_Hall/events.inc | 4 +- data/maps/DoubleBattleColosseum/events.inc | 8 +- data/maps/EverGrandeCity/events.inc | 32 +++--- data/maps/FallarborTown/events.inc | 16 +-- data/maps/FallarborTown_BattleTentLobby/events.inc | 2 +- data/maps/FarawayIsland_Entrance/events.inc | 8 +- data/maps/FortreeCity/events.inc | 12 +-- data/maps/FortreeCity_Gym/events.inc | 4 +- data/maps/GraniteCave_B2F/events.inc | 4 +- data/maps/InsideOfTruck/events.inc | 16 +-- data/maps/IslandCave/events.inc | 6 +- data/maps/JaggedPass/events.inc | 24 ++--- data/maps/LavaridgeTown/events.inc | 18 ++-- data/maps/LavaridgeTown_Gym_1F/events.inc | 4 +- data/maps/LilycoveCity/events.inc | 26 ++--- data/maps/LilycoveCity_ContestHall/events.inc | 12 +-- data/maps/LilycoveCity_ContestLobby/events.inc | 24 ++--- data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/events.inc | 4 +- .../LilycoveCity_DepartmentStore_1F/events.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F/events.inc | 32 +++--- .../maps/LilycoveCity_LilycoveMuseum_2F/events.inc | 24 ++--- data/maps/LittlerootTown/events.inc | 26 ++--- .../LittlerootTown_BrendansHouse_1F/events.inc | 8 +- .../LittlerootTown_BrendansHouse_2F/events.inc | 8 +- data/maps/LittlerootTown_MaysHouse_1F/events.inc | 8 +- data/maps/LittlerootTown_MaysHouse_2F/events.inc | 8 +- .../LittlerootTown_ProfessorBirchsLab/events.inc | 30 +++--- data/maps/MarineCave_End/events.inc | 2 +- data/maps/MauvilleCity/events.inc | 16 +-- data/maps/MauvilleCity_BikeShop/events.inc | 4 +- data/maps/MauvilleCity_GameCorner/events.inc | 48 ++++----- data/maps/MauvilleCity_Gym/events.inc | 12 +-- data/maps/MeteorFalls_1F_1R/events.inc | 4 +- data/maps/MeteorFalls_1F_2R/events.inc | 2 +- data/maps/MossdeepCity/events.inc | 36 +++---- data/maps/MossdeepCity_GameCorner_1F/events.inc | 6 +- data/maps/MossdeepCity_Gym/events.inc | 22 ++--- data/maps/MossdeepCity_StevensHouse/events.inc | 8 +- data/maps/MtChimney/events.inc | 4 +- data/maps/MtPyre_Exterior/events.inc | 14 +-- data/maps/MtPyre_Summit/events.inc | 16 +-- data/maps/NavelRock_Top/events.inc | 4 +- data/maps/NewMauville_Entrance/events.inc | 2 +- data/maps/NewMauville_Inside/events.inc | 36 +++---- data/maps/OldaleTown/events.inc | 18 ++-- data/maps/PacifidlogTown/events.inc | 6 +- data/maps/PetalburgCity/events.inc | 32 +++--- data/maps/PetalburgCity_Gym/events.inc | 28 +++--- data/maps/PetalburgWoods/events.inc | 16 +-- data/maps/RecordCorner/events.inc | 8 +- data/maps/Route101/events.inc | 20 ++-- data/maps/Route102/events.inc | 4 +- data/maps/Route103/events.inc | 2 +- data/maps/Route104/events.inc | 22 ++--- data/maps/Route105/events.inc | 4 +- data/maps/Route106/events.inc | 8 +- data/maps/Route108/events.inc | 2 +- data/maps/Route109/events.inc | 16 +-- data/maps/Route110/events.inc | 52 +++++----- .../events.inc | 4 +- .../events.inc | 4 +- data/maps/Route110_TrickHouseEnd/events.inc | 4 +- data/maps/Route110_TrickHouseEntrance/events.inc | 10 +- data/maps/Route110_TrickHousePuzzle1/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/events.inc | 10 +- data/maps/Route110_TrickHousePuzzle3/events.inc | 10 +- data/maps/Route110_TrickHousePuzzle4/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/events.inc | 46 ++++----- data/maps/Route110_TrickHousePuzzle6/events.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/events.inc | 10 +- data/maps/Route110_TrickHousePuzzle8/events.inc | 2 +- data/maps/Route111/events.inc | 104 +++++++++---------- data/maps/Route112/events.inc | 6 +- data/maps/Route113/events.inc | 54 +++++----- data/maps/Route114/events.inc | 24 ++--- data/maps/Route114_FossilManiacsHouse/events.inc | 8 +- data/maps/Route114_FossilManiacsTunnel/events.inc | 4 +- data/maps/Route114_LanettesHouse/events.inc | 6 +- data/maps/Route115/events.inc | 28 +++--- data/maps/Route116/events.inc | 24 ++--- data/maps/Route117/events.inc | 8 +- data/maps/Route118/events.inc | 24 ++--- data/maps/Route119/events.inc | 86 ++++++++-------- data/maps/Route119_WeatherInstitute_1F/events.inc | 8 +- data/maps/Route120/events.inc | 66 ++++++------- data/maps/Route121/events.inc | 28 +++--- data/maps/Route121_SafariZoneEntrance/events.inc | 4 +- data/maps/Route123/events.inc | 66 ++++++------- data/maps/Route124/events.inc | 2 +- .../Route124_DivingTreasureHuntersHouse/events.inc | 2 +- data/maps/Route125/events.inc | 8 +- data/maps/Route127/events.inc | 10 +- data/maps/Route128/events.inc | 6 +- data/maps/RustboroCity/events.inc | 62 ++++++------ data/maps/RustboroCity_DevonCorp_1F/events.inc | 4 +- data/maps/RustboroCity_DevonCorp_3F/events.inc | 4 +- data/maps/RustboroCity_Gym/events.inc | 4 +- data/maps/RustboroCity_PokemonSchool/events.inc | 10 +- data/maps/RusturfTunnel/events.inc | 10 +- data/maps/SSTidalCorridor/events.inc | 24 ++--- data/maps/SSTidalLowerDeck/events.inc | 2 +- data/maps/SSTidalRooms/events.inc | 4 +- data/maps/SafariZone_Northeast/events.inc | 4 +- data/maps/SafariZone_Southeast/events.inc | 4 +- data/maps/SafariZone_Southwest/events.inc | 2 +- data/maps/SeafloorCavern_Room9/events.inc | 2 +- data/maps/SealedChamber_InnerRoom/events.inc | 18 ++-- data/maps/SealedChamber_OuterRoom/events.inc | 58 +++++------ data/maps/ShoalCave_LowTideInnerRoom/events.inc | 12 +-- data/maps/ShoalCave_LowTideLowerRoom/events.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/events.inc | 2 +- data/maps/SingleBattleColosseum/events.inc | 4 +- data/maps/SkyPillar_Top/events.inc | 2 +- data/maps/SlateportCity/events.inc | 28 +++--- data/maps/SlateportCity_BattleTentLobby/events.inc | 2 +- data/maps/SlateportCity_Harbor/events.inc | 8 +- .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 30 +++--- .../maps/SlateportCity_OceanicMuseum_2F/events.inc | 42 ++++---- data/maps/SootopolisCity/events.inc | 12 +-- data/maps/SootopolisCity_Gym_1F/events.inc | 4 +- .../SootopolisCity_LotadAndSeedotHouse/events.inc | 4 +- data/maps/SouthernIsland_Exterior/events.inc | 2 +- data/maps/SouthernIsland_Interior/events.inc | 2 +- data/maps/TerraCave_End/events.inc | 2 +- data/maps/TradeCenter/events.inc | 4 +- data/maps/TrainerHill_Entrance/events.inc | 4 +- data/maps/Underwater1/events.inc | 14 +-- data/maps/Underwater2/events.inc | 16 +-- data/maps/Underwater3/events.inc | 8 +- data/maps/Underwater4/events.inc | 4 +- data/maps/Underwater_SealedChamber/events.inc | 2 +- data/maps/VerdanturfTown/events.inc | 16 +-- .../maps/VerdanturfTown_BattleTentLobby/events.inc | 2 +- data/maps/VictoryRoad_1F/events.inc | 6 +- data/maps/VictoryRoad_B2F/events.inc | 4 +- include/constants/bg_event_constants.h | 13 +++ include/constants/secret_bases.h | 110 +++++++++++++++++++++ src/item_use.c | 5 +- src/secret_base.c | 7 +- 165 files changed, 1251 insertions(+), 1106 deletions(-) create mode 100755 include/constants/bg_event_constants.h create mode 100755 include/constants/secret_bases.h diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 69b3629f6..23806b4cc 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -34,18 +34,27 @@ inc _num_warps .endm - .macro coord_event x, y, byte1, byte2, word1, word2, word3, script + .macro coord_event x, y, elevation, trigger, index, script .2byte \x, \y - .byte \byte1, \byte2 - .2byte \word1, \word2, \word3 + .byte \elevation, 0 + .2byte \trigger, \index, 0 .4byte \script inc _num_traps .endm - .macro bg_event x, y, byte, kind, word, arg6, arg7, arg8 + .macro coord_weather_event x, y, elevation, weather .2byte \x, \y - .byte \byte, \kind - .2byte \word + .byte \elevation, 0 + .2byte \weather + .2byte 0, 0 + .4byte 0 + inc _num_traps + .endm + + .macro bg_event x, y, elevation, kind, arg6, arg7, arg8 + .2byte \x, \y + .byte \elevation, \kind + .2byte 0 .if \kind < 5 .4byte \arg6 .else @@ -55,6 +64,14 @@ inc _num_signs .endm + .macro bg_hidden_item_event x, y, height, item, flag + bg_event \x, \y, \height, 7, \item, \flag, 0 + .endm + + .macro bg_secret_base_event x, y, height, secret_base_id + bg_event \x, \y, \height, 8, \secret_base_id, 0, 0 + .endm + .macro map_events npcs, warps, traps, signs .byte _num_npcs, _num_warps, _num_traps, _num_signs .4byte \npcs, \warps, \traps, \signs diff --git a/data/map_events.s b/data/map_events.s index d268cba63..1d4813b73 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,9 +1,12 @@ +#include "constants/bg_event_constants.h" #include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" #include "constants/maps.h" +#include "constants/secret_bases.h" #include "constants/vars.h" +#include "constants/weather.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index d3b72825e..34bc41cf0 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -13,7 +13,7 @@ AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 - bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8 + bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8 AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884 map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc index fd5cb4ac8..54453b729 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -7,10 +7,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC - bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 - bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 - bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 - bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE + 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 map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index 3c9cb9a0d..07dd3558b 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -16,16 +16,16 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 - bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0 - bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0 - bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0 - bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0 - bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 + bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31 + bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32 + bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33 + bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34 + 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:: @ 8536C60 map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 8008e9d5c..207744c30 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -7,9 +7,9 @@ AncientTomb_MapWarps: @ 8536CF4 warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB AncientTomb_MapBGEvents: @ 8536D0C - bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033 - bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050 - bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050 + 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 map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index 628ff1158..09846d401 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -19,8 +19,8 @@ AquaHideout_B2F_MapWarps: @ 85355BC warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents: @ 853560C - coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 - coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 + 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 map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc index 4294d60dd..5b47d72a5 100644 --- a/data/maps/ArtisanCave_B1F/events.inc +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -6,10 +6,10 @@ ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F ArtisanCave_B1F_MapBGEvents: @ 8537730 - bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0 - bg_event 27, 8, 0, 7, 0, ITEM_CALCIUM, 101, 0 - bg_event 7, 5, 0, 7, 0, ITEM_PROTEIN, 103, 0 - bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0 + bg_hidden_item_event 32, 29, 0, ITEM_ZINC, 102 + bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, 101 + bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, 103 + bg_hidden_item_event 19, 43, 0, ITEM_IRON, 104 ArtisanCave_B1F_MapEvents:: @ 8537760 map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc index 4b8e0de0d..20233160e 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc @@ -9,8 +9,8 @@ BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 - bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092 - bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA + 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 map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc index 4cd125033..c24a47301 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc @@ -11,10 +11,10 @@ BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 - bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52 - bg_event 7, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D84 - bg_event 18, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D6B - bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34 + 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 map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc index dd7b4029d..063f49813 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc @@ -11,9 +11,9 @@ BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 - bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 - bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA - bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839 + 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 map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc index c53e0f875..5dae24a71 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc @@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 - bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 - bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 - bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 + 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 map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc index 5fddc6f37..1020cef3c 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc @@ -10,8 +10,8 @@ BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 - bg_event 8, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BA80 - bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 + 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 map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc index 07c2866a1..580873720 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc @@ -3,13 +3,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 - coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 - coord_event 3, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 3, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 4, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 5, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 4, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D + 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:: @ 853CDF4 map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc index 20e6cb085..61cb8ede4 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc @@ -1,11 +1,11 @@ BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 - coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 - coord_event 3, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 4, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 5, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 3, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 4, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 5, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + 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:: @ 853CEA4 map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc index a04f0cf4e..dbc3584a6 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc @@ -3,15 +3,15 @@ BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 - coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E - coord_event 6, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 - coord_event 10, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 - coord_event 5, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 5, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D + 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:: @ 853CD40 map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc index dd3722945..521577c4c 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -8,8 +8,8 @@ BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 - bg_event 5, 12, 0, 1, 0, BattleFrontier_BattlePyramidLobby_EventScript_250D42 - bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95 + 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 map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc index a42052d96..fbf4941ca 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc @@ -3,7 +3,7 @@ BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 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 - coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 + coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800 map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc index ef38d131b..73bdeeb2b 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -15,11 +15,11 @@ BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728 - bg_event 4, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 - bg_event 8, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFE0 - bg_event 12, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFF9 - bg_event 16, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23F012 - bg_event 2, 1, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23F4BE + 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 map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc index 7d25049fd..526c53971 100644 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -43,14 +43,14 @@ BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 - bg_event 13, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C43 - bg_event 43, 56, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C4C - bg_event 36, 34, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C55 - bg_event 62, 15, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C5E - bg_event 7, 29, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DD7 - bg_event 32, 13, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DCE - bg_event 4, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73 - bg_event 5, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73 + 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:: @ 853BE50 map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc index b2315873c..8095b6d6c 100644 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ b/data/maps/BattleFrontier_OutsideWest/events.inc @@ -38,11 +38,11 @@ BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8 - bg_event 15, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4E2 - bg_event 45, 30, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4F4 - bg_event 16, 43, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4EB - bg_event 52, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A - bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A + 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 map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc index ba9d3a30f..33069e0ca 100644 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ b/data/maps/BattleFrontier_RankingHall/events.inc @@ -8,18 +8,18 @@ BattleFrontier_RankingHall_MapWarps: @ 853CF00 warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 - bg_event 26, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4AA - bg_event 23, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4B6 - bg_event 26, 5, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4C2 - bg_event 29, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4CE - bg_event 42, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4DA - bg_event 46, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4E6 - bg_event 10, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4F2 - bg_event 8, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4FE - bg_event 6, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E50A - bg_event 44, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E516 - bg_event 16, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E538 - bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541 + 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:: @ 853CFA0 map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index 01a258600..036127ca8 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -7,9 +7,9 @@ DesertRuins_MapWarps: @ 853436C warp_def 8, 11, 3, 1, MAP_DESERT_RUINS DesertRuins_MapBGEvents: @ 8534384 - bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_22D9DB - bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 - bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 + 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 map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index 77a6ab889..fadd3b282 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -13,11 +13,11 @@ DewfordTown_MapWarps: @ 85279DC warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 DewfordTown_MapBGEvents: @ 8527A04 - bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_1E95BA - bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_1E95C3 - bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_271E73 - bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_271E73 - bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_1E95CC + 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 map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index 26ebf4501..a4c45c2cb 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -13,10 +13,10 @@ DewfordTown_Gym_MapWarps: @ 852DBF4 warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents: @ 852DC04 - bg_event 4, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9B2 - bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9B2 + 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 map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 7c494b698..cd6fb5e8f 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -14,8 +14,8 @@ DewfordTown_Hall_MapWarps: @ 852DD20 warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents: @ 852DD30 - bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD590 - bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD5A0 + 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 map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc index f28e9e3e1..ffea67228 100644 --- a/data/maps/DoubleBattleColosseum/events.inc +++ b/data/maps/DoubleBattleColosseum/events.inc @@ -5,10 +5,10 @@ DoubleBattleColosseum_MapWarps: @ 8539E88 warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents: @ 8539EA8 - coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277388 - coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773BE - coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773A3 - coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773D9 + 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 map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index b8ca9eea4..e6bc7a10a 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.inc @@ -5,24 +5,24 @@ EverGrandeCity_MapWarps: @ 8527588 warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents: @ 85275A8 - coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_1E7D46 + 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: @ 8527658 - bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_1E7D2B - bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73 - bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_1E7D34 - bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_1E7D3D - bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73 + 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 map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index b6c3400c6..fae6f714e 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -12,14 +12,14 @@ FallarborTown_MapWarps: @ 8527C40 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents: @ 8527C68 - bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_271E6A - bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_271E73 - bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_1EB250 - bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_271E73 - bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_1EB259 - bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_271E6A - bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_1EB262 - bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0 + 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, 28 FallarborTown_MapEvents:: @ 8527CC8 map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc index cdcc4c792..cdf9c79b9 100644 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ b/data/maps/FallarborTown_BattleTentLobby/events.inc @@ -10,7 +10,7 @@ FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8 - bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F + bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_BattleTentLobby_EventScript_20024F FallarborTown_BattleTentLobby_MapEvents:: @ 852E404 map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc index e8b94c460..6c2a8ebe3 100644 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ b/data/maps/FarawayIsland_Entrance/events.inc @@ -7,12 +7,12 @@ FarawayIsland_Entrance_MapWarps: @ 853D740 warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR FarawayIsland_Entrance_MapCoordEvents: @ 853D750 - coord_event 9, 18, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98 - coord_event 10, 20, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C9D - coord_event 22, 9, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98 + 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 - bg_event 3, 32, 0, 1, 0, FarawayIsland_Entrance_EventScript_267CF1 + bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, FarawayIsland_Entrance_EventScript_267CF1 FarawayIsland_Entrance_MapEvents:: @ 853D78C map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index 2b21594a1..914c4901c 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -19,12 +19,12 @@ FortreeCity_MapWarps: @ 8526C44 warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP FortreeCity_MapBGEvents: @ 8526C8C - bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_1E2602 - bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_271E73 - bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_271E6A - bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_1E260B - bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_271E73 - bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_271E6A + 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:: @ 8526CD4 map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 8abef75e8..5cc222c4e 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -13,8 +13,8 @@ FortreeCity_Gym_MapWarps: @ 8530D58 warp_def 16, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents: @ 8530D68 - bg_event 14, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216751 - bg_event 17, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216761 + 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 map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index bcc0a5a4e..e128b40b2 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -17,8 +17,8 @@ GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F GraniteCave_B2F_MapBGEvents: @ 8534584 - bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0 - bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0 + bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, 48 + bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, 49 GraniteCave_B2F_MapEvents:: @ 853459C map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index 104df23d2..f8dbe9ad7 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -9,16 +9,16 @@ InsideOfTruck_MapWarps: @ 853A0C0 warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents: @ 853A0D8 - coord_event 3, 1, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 2, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 3, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04 + 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 - bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C - bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_23BF6C - bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_23BF6C - bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_23BF6C - bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_23BF6C + 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 map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index c02d93dde..01283e146 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -7,9 +7,9 @@ IslandCave_MapWarps: @ 8536C8C warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE IslandCave_MapBGEvents: @ 8536CA4 - bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_238EEF - bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_238F1D - bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D + 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 map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index ce6eb77bd..b1028c978 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -15,20 +15,20 @@ JaggedPass_MapWarps: @ 8534B8C warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F JaggedPass_MapCoordEvents: @ 8534BB4 - coord_event 13, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 21, 12, 3, 0, 8, 0, 0, 0x0 - coord_event 14, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 18, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 22, 19, 3, 0, 2, 0, 0, 0x0 - coord_event 21, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB - coord_event 22, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB - coord_event 21, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB - coord_event 14, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB - coord_event 13, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB + 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: @ 8534C54 - bg_event 8, 10, 3, 7, 0, ITEM_FULL_HEAL, 77, 0 - bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0 + bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, 77 + bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, 76 JaggedPass_MapEvents:: @ 8534C6C map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 755e606b0..184bed05e 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -18,17 +18,17 @@ LavaridgeTown_MapWarps: @ 8527B2C warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F LavaridgeTown_MapCoordEvents: @ 8527B5C - coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA6FA + coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_1EA6FA LavaridgeTown_MapBGEvents: @ 8527B6C - bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_1EA7B7 - bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_1EA7AE - bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A - bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA7A5 - bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73 - bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A - bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73 - bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0 + 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, 0 LavaridgeTown_MapEvents:: @ 8527BCC map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index 8560ee3a8..d8aa6daa4 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -35,8 +35,8 @@ LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C - bg_event 10, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE98B - bg_event 16, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE99B + 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 map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 421a2c094..240de9cd4 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -39,19 +39,19 @@ LilycoveCity_MapWarps: @ 8526EF8 warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_MapBGEvents: @ 8526F68 - bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D1A - bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_271E73 - bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D6B - bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_271E73 - bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_1E2CFF - bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D08 - bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D11 - bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_1E2D44 - bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_1E2D62 - bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_1E2D74 - bg_event 36, 31, 3, 7, 0, ITEM_HEART_SCALE, 27, 0 - bg_event 61, 7, 0, 7, 0, ITEM_PP_UP, 43, 0 - bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0 + 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, 27 + bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, 43 + bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, 75 LilycoveCity_MapEvents:: @ 8527004 map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index c7477af3c..751bc0fc7 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -39,12 +39,12 @@ LilycoveCity_ContestHall_MapWarps: @ 8531B50 warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 - bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C - bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C + 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:: @ 8531BB8 map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index 27448106f..67f644529 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -32,18 +32,18 @@ LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC - bg_event 23, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_294055 - bg_event 23, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293E1E - bg_event 23, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A753 - bg_event 25, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A75A - bg_event 27, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A761 - bg_event 30, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A77A - bg_event 3, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A73E - bg_event 5, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A745 - bg_event 7, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A74C - bg_event 27, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293C3E - bg_event 27, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293D4D - bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784 + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_294055 + 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, LilycoveCity_ContestLobby_EventScript_293C3E + 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 map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index 5595da718..66fd112c4 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 - coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 + coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174 map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index 8492376e2..279772204 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -8,8 +8,8 @@ LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484 - bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 - bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 + 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 map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index 3ebc7c803..b2771391b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -13,7 +13,7 @@ LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C - bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D + bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_21F85D LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148 map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index 7a66d580c..f24ede1b9 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -16,22 +16,22 @@ LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 - bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA - bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8 - bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3 - bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC + 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:: @ 8531414 map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index 968a61b1d..d88bae478 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -8,18 +8,18 @@ LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 - bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA - bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA + 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:: @ 8531520 map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index fd257b17d..b6e7c3cf9 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -14,21 +14,21 @@ LittlerootTown_MapWarps: @ 8527768 warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents: @ 8527780 - coord_event 10, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E8091 - coord_event 11, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E80EF - coord_event 11, 1, 3, 0, VAR_0x4050, 1, 0, LittlerootTown_EventScript_1E811F - coord_event 8, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81F9 - coord_event 9, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E8205 - coord_event 10, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81E1 - coord_event 11, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81ED - coord_event 10, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81BB - coord_event 11, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81CE + 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: @ 8527810 - bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_1E8151 - bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_1E815A - bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_1E8163 - bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_1E818F + 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 map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index df0022c99..57538339f 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -13,10 +13,10 @@ LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C - coord_event 8, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 - coord_event 7, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE - coord_event 8, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA - coord_event 9, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 + 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 map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index fbcc38a03..815acaa82 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -20,10 +20,10 @@ LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328 - bg_event 0, 1, 0, 1, 0, gUnknown_081F860D - bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8656 - bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_292781 - bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F865F + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, gUnknown_081F860D + 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 map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 34eeeb750..fda8175bb 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -13,10 +13,10 @@ LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C - coord_event 2, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C - coord_event 1, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A67 - coord_event 2, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A73 - coord_event 3, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F + 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 map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 037f0538a..6d541e1e3 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -20,10 +20,10 @@ LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608 - bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F865F - bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F8656 - bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_29278D - bg_event 8, 1, 0, 0, 0, gUnknown_081F9553 + 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, gUnknown_081F9553 LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638 map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index 41e5112f7..df992a2e3 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -11,21 +11,21 @@ LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC - bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB + 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:: @ 852D7A0 map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc index 0d3014ab1..8569e33ec 100644 --- a/data/maps/MarineCave_End/events.inc +++ b/data/maps/MarineCave_End/events.inc @@ -5,7 +5,7 @@ MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE MarineCave_End_MapCoordEvents: @ 8537808 - coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B + coord_event 9, 26, 3, VAR_TEMP_1, 1, MarineCave_End_EventScript_23B01B MarineCave_End_MapEvents:: @ 8537818 map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index cc393513d..5b2d9927c 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -21,14 +21,14 @@ MauvilleCity_MapWarps: @ 8526734 warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 MauvilleCity_MapBGEvents: @ 852676C - bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_271E73 - bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_1DF3E0 - bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A - bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A - bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_271E73 - bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_1DF3D7 - bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_1DF3E9 - bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_1DF3F2 + 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:: @ 85267CC map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index c1ee85909..7befd0f73 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -7,8 +7,8 @@ MauvilleCity_BikeShop_MapWarps: @ 852FEB0 warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0 - bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED3A - bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EDAE + 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 map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index 8c30b75b7..79b436489 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -17,30 +17,30 @@ MauvilleCity_GameCorner_MapWarps: @ 8530048 warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents: @ 8530058 - bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102D6 - bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102F6 - bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210316 - bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210336 - bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210356 - bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210376 - bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210396 - bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103B6 - bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103D6 - bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_2103F6 - bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210416 - bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210436 - bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF + 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:: @ 8530178 map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index c1b2b0053..cb126faef 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -12,14 +12,14 @@ MauvilleCity_Gym_MapWarps: @ 852FE04 warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents: @ 852FE14 - coord_event 4, 12, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E01E - coord_event 3, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E043 - coord_event 0, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20DFF9 - coord_event 8, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_20E068 + 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 - bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E14B - bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E15B + 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 map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 21535add7..068f9a356 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -19,10 +19,10 @@ MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE MeteorFalls_1F_1R_MapCoordEvents: @ 8534094 - coord_event 14, 18, 4, 0, VAR_0x40BF, 0, 0, MeteorFalls_1F_1R_EventScript_22BD5F + coord_event 14, 18, 4, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F MeteorFalls_1F_1R_MapBGEvents: @ 85340A4 - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_1R_MapEvents:: @ 85340B0 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_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index 4cab5be37..1e8e1f093 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -10,7 +10,7 @@ MeteorFalls_1F_2R_MapWarps: @ 853410C warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_2R_MapBGEvents: @ 853412C - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_2R_MapEvents:: @ 8534138 map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index c95cdf5cf..0413b1be4 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -30,26 +30,26 @@ MossdeepCity_MapWarps: @ 85271B0 warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents: @ 8527200 - coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_1E4B38 - coord_event 42, 21, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 41, 22, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 41, 23, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 41, 24, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 40, 25, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 - coord_event 40, 26, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41 + 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: @ 85272A0 - bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B26 - bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_1E4B1D - bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_271E73 - bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A - bg_event 66, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B2F - bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_271E73 - bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A - bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_1E4B14 + 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:: @ 8527300 map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 603d7f3d8..4186ec9ca 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -8,9 +8,9 @@ MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88 - bg_event 3, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B5D - bg_event 0, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E9D - bg_event 1, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E96 + 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 map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index 8245f1fc2..a6511d2c1 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -53,19 +53,19 @@ MossdeepCity_Gym_MapWarps: @ 853284C warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM MossdeepCity_Gym_MapCoordEvents: @ 85328BC - coord_event 2, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67 - coord_event 8, 10, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 6, 7, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 15, 34, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C93 - coord_event 23, 24, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 23, 21, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 8, 6, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220CBF - coord_event 21, 6, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220AF1 - coord_event 3, 30, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_220C67 + 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: @ 853294C - bg_event 4, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C33 - bg_event 8, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C43 + 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 map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index 521c71e72..66e00b1f4 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -8,10 +8,10 @@ MossdeepCity_StevensHouse_MapWarps: @ 8532C58 warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68 - bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 + 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 map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index a8002de8f..03806a854 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -37,8 +37,8 @@ MtChimney_MapWarps: @ 8534A98 warp_def 21, 41, 3, 3, MAP_JAGGED_PASS MtChimney_MapBGEvents: @ 8534AB8 - bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_22F0E4 - bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141 + 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 map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index ec247fd67..16fd3530f 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -8,15 +8,15 @@ MtPyre_Exterior_MapWarps: @ 853510C warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT MtPyre_Exterior_MapCoordEvents: @ 8535124 - coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED + 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 - bg_event 9, 8, 0, 7, 0, ITEM_ULTRA_BALL, 29, 0 - bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0 + bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, 29 + bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, 78 MtPyre_Exterior_MapEvents:: @ 853518C map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 35107f3f0..669625c41 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -14,16 +14,16 @@ MtPyre_Summit_MapWarps: @ 8535260 warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents: @ 8535278 - coord_event 22, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232018 - coord_event 23, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232024 - coord_event 24, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232030 - coord_event 22, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321EC - coord_event 23, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321F8 - coord_event 24, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_232204 + 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: @ 85352D8 - bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0 - bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0 + bg_hidden_item_event 9, 25, 0, ITEM_ZINC, 79 + bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, 80 MtPyre_Summit_MapEvents:: @ 85352F0 map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index 6f7253a2b..ef781a838 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -5,10 +5,10 @@ NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 NavelRock_Top_MapCoordEvents: @ 853DB94 - coord_event 12, 10, 3, 0, VAR_TEMP_1, 0, 0, NavelRock_Top_EventScript_26916F + coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F NavelRock_Top_MapBGEvents: @ 853DBA4 - bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0 + bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, 109 NavelRock_Top_MapEvents:: @ 853DBB0 map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc index 29f46af20..4c333f6b3 100644 --- a/data/maps/NewMauville_Entrance/events.inc +++ b/data/maps/NewMauville_Entrance/events.inc @@ -3,7 +3,7 @@ NewMauville_Entrance_MapWarps: @ 8536474 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents: @ 8536484 - coord_event 4, 2, 3, 0, VAR_0x40BA, 0, 0, NewMauville_Entrance_EventScript_2372FF + coord_event 4, 2, 3, VAR_0x40BA, 0, NewMauville_Entrance_EventScript_2372FF NewMauville_Entrance_MapEvents:: @ 8536494 map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index 805c1db6e..af8f10f99 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -12,26 +12,26 @@ NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents: @ 8536570 - coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_237459 - coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_237471 - coord_event 33, 6, 3, 0, VAR_0x40BA, 1, 0, NewMauville_Inside_EventScript_237725 + 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: @ 8536610 - bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F - bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F + 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:: @ 8536670 map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index 1ba9ea124..8c637b2bf 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -11,17 +11,17 @@ OldaleTown_MapWarps: @ 85278B4 warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents: @ 85278D4 - coord_event 0, 10, 3, 0, VAR_0x4051, 0, 0, OldaleTown_EventScript_1E903F - coord_event 8, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E9086 - coord_event 9, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90A6 - coord_event 10, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90C6 + 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 - bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_1E8EEA - bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_271E73 - bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_271E6A - bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_271E73 - bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_271E6A + 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 map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index 8e1134f86..a601c8381 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -12,9 +12,9 @@ PacifidlogTown_MapWarps: @ 8527E30 warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 PacifidlogTown_MapBGEvents: @ 8527E60 - bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 - bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_1EBADE - bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 + 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 map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index f33ff0918..b3fd71d2c 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -18,24 +18,24 @@ PetalburgCity_MapWarps: @ 85260A8 warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents: @ 85260D8 - coord_event 8, 10, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC49A - coord_event 8, 11, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4A6 - coord_event 8, 12, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4B2 - coord_event 8, 13, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4BE - coord_event 4, 10, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC691 - coord_event 4, 11, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6A7 - coord_event 4, 12, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6BD - coord_event 4, 13, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6D3 + 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: @ 8526158 - bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_1DC476 - bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A - bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_271E73 - bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_1DC47F - bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_271E73 - bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A - bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_1DC491 - bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0 + 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, 95 PetalburgCity_MapEvents:: @ 85261B8 map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index e3cfe95cc..209c789a0 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -52,20 +52,20 @@ PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM PetalburgCity_Gym_MapBGEvents: @ 852F000 - bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205137 - bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205187 - bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051BC - bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051EF - bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205222 - bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205255 - bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_205288 - bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052BB - bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052EE - bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_205321 - bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_205354 - bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_205387 - bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20576E - bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20577E + 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:: @ 852F0A8 map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index aaab1e751..e0bfbc630 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -22,16 +22,16 @@ PetalburgWoods_MapWarps: @ 853471C warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents: @ 853474C - coord_event 26, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22DFD7 - coord_event 27, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22E079 + 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 - bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_22E25B - bg_event 39, 35, 3, 7, 0, ITEM_POTION, 58, 0 - bg_event 26, 6, 3, 7, 0, ITEM_TINY_MUSHROOM, 59, 0 - bg_event 40, 29, 3, 7, 0, ITEM_TINY_MUSHROOM, 60, 0 - bg_event 4, 19, 3, 7, 0, ITEM_POKE_BALL, 61, 0 - bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_22E264 + bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B + bg_hidden_item_event 39, 35, 3, ITEM_POTION, 58 + bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, 59 + bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, 60 + bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, 61 + bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 PetalburgWoods_MapEvents:: @ 85347B4 map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index b5e297f72..8e1916a5a 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -8,10 +8,10 @@ RecordCorner_MapWarps: @ 8539E14 warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents: @ 8539E34 - coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827741D - coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277447 - coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277432 - coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C + 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 map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 969166de9..d43253baa 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -7,18 +7,18 @@ Route101_EventObjects: @ 8527E98 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, 991 Route101_MapCoordEvents: @ 8527F28 - coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE - coord_event 11, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE - coord_event 10, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E - coord_event 11, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E - coord_event 6, 16, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64 - coord_event 6, 15, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64 - coord_event 6, 17, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64 - coord_event 6, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64 - coord_event 7, 13, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD7A + 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: @ 8527FB8 - bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D Route101_MapEvents:: @ 8527FC4 map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index a51e09b59..58a0bf64b 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -10,8 +10,8 @@ Route102_EventObjects: @ 8527FD8 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 - bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 - bg_event 40, 9, 0, 0, 0, Route102_EventScript_1EC0EA + 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 map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index ab858ae13..6581eb582 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -24,7 +24,7 @@ Route103_MapWarps: @ 85282BC warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE Route103_MapBGEvents: @ 85282C4 - bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB Route103_MapEvents:: @ 85282D0 map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 52a60261a..497ec2dec 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -45,19 +45,19 @@ Route104_MapWarps: @ 8528614 warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS Route104_MapCoordEvents: @ 8528654 - coord_event 17, 51, 3, 0, VAR_0x4063, 1, 0, Route104_EventScript_1ECCB3 + coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 Route104_MapBGEvents: @ 8528664 - bg_event 20, 50, 0, 0, 0, Route104_EventScript_1ED018 - bg_event 27, 66, 0, 0, 0, Route104_EventScript_1ED021 - bg_event 23, 5, 0, 0, 0, Route104_EventScript_1ED02A - bg_event 7, 20, 0, 0, 0, Route104_EventScript_1ED033 - bg_event 17, 23, 3, 0, 0, Route104_EventScript_1ED03C - bg_event 7, 6, 3, 7, 0, ITEM_SUPER_POTION, 44, 0 - bg_event 3, 9, 3, 7, 0, ITEM_POKE_BALL, 62, 0 - bg_event 14, 55, 3, 7, 0, ITEM_POTION, 37, 0 - bg_event 16, 72, 3, 7, 0, ITEM_ANTIDOTE, 85, 0 - bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0 + 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, 44 + bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, 62 + bg_hidden_item_event 14, 55, 3, ITEM_POTION, 37 + bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, 85 + bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, 88 Route104_MapEvents:: @ 85286DC map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index cf7addcc8..aa9b9b420 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -12,8 +12,8 @@ Route105_MapWarps: @ 85287B0 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents: @ 85287B8 - bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0 - bg_event 5, 56, 3, 7, 0, ITEM_BIG_PEARL, 111, 0 + bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, 89 + bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, 111 Route105_MapEvents:: @ 85287D0 map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 22807fcec..11541f2bf 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -9,10 +9,10 @@ Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents: @ 8528864 - bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0 - bg_event 53, 12, 0, 7, 0, ITEM_STARDUST, 46, 0 - bg_event 68, 15, 3, 7, 0, ITEM_HEART_SCALE, 47, 0 - bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A + bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, 63 + bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, 46 + bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, 47 + bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A Route106_MapEvents:: @ 8528894 map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index a83027178..e18cf16d0 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -11,7 +11,7 @@ Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents: @ 8528A14 - bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 + bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, 86 Route108_MapEvents:: @ 8528A20 map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 66527a7ae..f74e1ceab 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -28,14 +28,14 @@ Route109_MapWarps: @ 8528C74 warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents: @ 8528C7C - bg_event 15, 5, 0, 0, 0, Route109_EventScript_1EEA2B - bg_event 29, 10, 3, 0, 0, Route109_EventScript_1EEA34 - bg_event 16, 23, 3, 7, 0, ITEM_REVIVE, 50, 0 - bg_event 33, 5, 3, 7, 0, ITEM_HEART_SCALE, 52, 0 - bg_event 9, 10, 3, 7, 0, ITEM_GREAT_BALL, 51, 0 - bg_event 28, 20, 3, 7, 0, ITEM_ETHER, 64, 0 - bg_event 13, 16, 3, 7, 0, ITEM_HEART_SCALE, 90, 0 - bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0 + 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, 50 + bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, 52 + bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, 51 + bg_hidden_item_event 28, 20, 3, ITEM_ETHER, 64 + bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, 90 + bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, 91 Route109_MapEvents:: @ 8528CDC map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index 4cb99b121..6e6d17d9a 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -45,34 +45,34 @@ Route110_MapWarps: @ 8529050 warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE Route110_MapCoordEvents: @ 8529080 - coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661 - coord_event 29, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661 - coord_event 33, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF74D - coord_event 34, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF758 - coord_event 35, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF763 - coord_event 7, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9CB - coord_event 8, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9D6 - coord_event 9, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9E1 - coord_event 10, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9EC + coord_event 28, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661 + coord_event 29, 92, 3, VAR_0x40A9, 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: @ 8529110 - bg_event 15, 25, 0, 0, 0, Route110_EventScript_1EF353 - bg_event 9, 51, 0, 0, 0, Route110_EventScript_1EF365 - bg_event 14, 88, 0, 0, 0, Route110_EventScript_1EF34A - bg_event 20, 94, 0, 0, 0, Route110_EventScript_1EF341 - bg_event 7, 79, 0, 0, 0, Route110_EventScript_1EF35C - bg_event 3, 17, 0, 0, 0, Route110_EventScript_1EF36E - bg_event 16, 25, 0, 8, 0, ITEM_MACHO_BRACE, 0, 0 - bg_event 17, 25, 0, 8, 0, ITEM_SOUL_DEW, 0, 0 - bg_event 33, 39, 3, 0, 0, Route110_EventScript_1EF377 - bg_event 37, 70, 3, 0, 0, Route110_EventScript_1EF380 - bg_event 8, 67, 0, 0, 0, Route110_EventScript_1EF389 - bg_event 32, 93, 0, 0, 0, Route110_EventScript_1EF392 - bg_event 35, 39, 3, 7, 0, ITEM_REVIVE, 54, 0 - bg_event 33, 45, 3, 7, 0, ITEM_GREAT_BALL, 53, 0 - bg_event 4, 35, 3, 7, 0, ITEM_POKE_BALL, 65, 0 - bg_event 37, 67, 3, 7, 0, ITEM_FULL_HEAL, 55, 0 - bg_event 13, 16, 0, 0, 0, Route110_EventScript_1EF34A + 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, 54 + bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, 53 + bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, 65 + bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, 55 + bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A Route110_MapEvents:: @ 85291DC map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index 4af135a6d..ee7f5ef17 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8 warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: @ 853E9D8 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 + 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 map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 3e9c99d55..8d10ce499 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24 warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: @ 853EA44 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 + 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 map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 8348be5cb..44539d4cc 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -6,10 +6,10 @@ Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 - coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_26B041 + coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 - bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 + bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, 1 Route110_TrickHouseEnd_MapEvents:: @ 853DF40 map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index d1083bb7f..5255e5acf 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -7,13 +7,13 @@ Route110_TrickHouseEntrance_MapWarps: @ 853DE84 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C - coord_event 4, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 5, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 6, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 7, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 + 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 - bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_26A0D3 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_26A0D3 Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8 map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index 38186f217..ae6de093d 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -21,7 +21,7 @@ Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108 - bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B + bg_event 3, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_26B92B Route110_TrickHousePuzzle1_MapEvents:: @ 853E114 map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index 2fa2f4bbc..0e8d3607b 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -11,13 +11,13 @@ Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8 - coord_event 11, 12, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD - coord_event 0, 4, 0, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 - coord_event 14, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 - coord_event 7, 11, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 + 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 - bg_event 14, 14, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBC0 + bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_26BBC0 Route110_TrickHousePuzzle2_MapEvents:: @ 853E204 map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 986384ad4..38063f98d 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8 - coord_event 4, 14, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD - coord_event 3, 11, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 - coord_event 12, 5, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 - coord_event 8, 2, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 + 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 - bg_event 0, 14, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C5A7 + bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_26C5A7 Route110_TrickHousePuzzle3_MapEvents:: @ 853E324 map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index 97022a3e0..f5406539f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -20,7 +20,7 @@ Route110_TrickHousePuzzle4_MapWarps: @ 853E488 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0 - bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861 + bg_event 14, 13, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_26C861 Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index 0401ef544..f91d26f4d 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -11,31 +11,31 @@ Route110_TrickHousePuzzle5_MapWarps: @ 853E538 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 - coord_event 5, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 - coord_event 4, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 - coord_event 3, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF - coord_event 2, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB - coord_event 1, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC13 - coord_event 2, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F - coord_event 13, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B - coord_event 12, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC67 - coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC73 - coord_event 13, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC97 - coord_event 12, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3 - coord_event 11, 4, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF - coord_event 1, 17, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC07 - coord_event 3, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B - coord_event 4, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC37 - coord_event 5, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC43 - coord_event 6, 7, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F - coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F - coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B - coord_event 11, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF - coord_event 10, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB - coord_event 9, 19, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 + 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: @ 853E6B0 - bg_event 11, 21, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB15 + bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_26CB15 Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 75d64270b..df3ef829a 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle6_MapWarps: @ 853E730 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748 - bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4 + bg_event 0, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_26DDC4 Route110_TrickHousePuzzle6_MapEvents:: @ 853E754 map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index 1d4373f25..62a52420b 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -25,13 +25,13 @@ Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8 - coord_event 8, 19, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E31B - coord_event 0, 14, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E331 - coord_event 6, 6, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E347 - coord_event 9, 7, 0, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E35D + 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 - bg_event 6, 17, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E1D0 + bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_26E1D0 Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4 map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index efeb449ff..a5d4c0f8a 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle8_MapWarps: @ 853E968 warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980 - bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802 + bg_event 3, 21, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_26E802 Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index b6aee76ac..cd11e1ef2 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -54,60 +54,60 @@ Route111_MapWarps: @ 8529640 warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE Route111_MapCoordEvents: @ 8529668 - coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A - coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A - coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A - coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F0A - coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_1F0F16 - coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD + 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: @ 8529888 - bg_event 16, 114, 0, 0, 0, Route111_EventScript_1F115C - bg_event 24, 126, 0, 0, 0, Route111_EventScript_1F1153 - bg_event 7, 66, 0, 0, 0, Route111_EventScript_1F1165 - bg_event 13, 6, 0, 0, 0, Route111_EventScript_1F116E - bg_event 24, 36, 0, 8, 0, ITEM_FAB_MAIL, 0, 0 - bg_event 34, 50, 0, 8, 0, ITEM_LUM_BERRY, 0, 0 - bg_event 33, 34, 0, 8, 0, ITEM_ORANGE_MAIL, 0, 0 - bg_event 25, 19, 0, 0, 0, Route111_EventScript_1F1177 - bg_event 35, 1, 0, 8, 0, ITEM_POTION, 0, 0 - bg_event 35, 31, 0, 8, 0, ITEM_POMEG_BERRY, 0, 0 - bg_event 26, 70, 0, 7, 0, ITEM_STARDUST, 2, 0 - bg_event 27, 27, 3, 8, 0, ITEM_REVIVAL_HERB, 0, 0 - bg_event 7, 84, 3, 0, 0, Route111_EventScript_1F1180 - bg_event 14, 19, 0, 8, 0, ITEM_PAMTRE_BERRY, 0, 0 - bg_event 13, 19, 0, 8, 0, ITEM_RABUTA_BERRY, 0, 0 - bg_event 19, 55, 0, 7, 0, ITEM_PROTEIN, 56, 0 - bg_event 35, 66, 0, 7, 0, ITEM_RARE_CANDY, 57, 0 - bg_event 24, 116, 0, 0, 0, Route111_EventScript_1F146C + 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, 2 + 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, 56 + bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, 57 + bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C Route111_MapEvents:: @ 8529960 map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index 7cf199eee..d61286928 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -23,9 +23,9 @@ Route112_MapWarps: @ 8529AC4 warp_def 22, 10, 0, 1, MAP_FIERY_PATH Route112_MapBGEvents: @ 8529AF4 - bg_event 19, 44, 3, 0, 0, Route112_EventScript_1F1E4F - bg_event 22, 37, 0, 0, 0, Route112_EventScript_1F1E46 - bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58 + 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 map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 23469ff17..7af1afea7 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -22,35 +22,35 @@ Route113_MapWarps: @ 8529CAC warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route113_MapCoordEvents: @ 8529CC4 - coord_event 19, 11, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 10, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 12, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 13, 3, 0, 8, 0, 0, 0x0 - coord_event 86, 9, 3, 0, 8, 0, 0, 0x0 - coord_event 85, 10, 3, 0, 8, 0, 0, 0x0 - coord_event 85, 11, 3, 0, 8, 0, 0, 0x0 - coord_event 14, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 11, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 12, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 13, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 8, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 9, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 11, 0, 0, 2, 0, 0, 0x0 - coord_event 19, 14, 3, 0, 8, 0, 0, 0x0 - coord_event 87, 8, 3, 0, 8, 0, 0, 0x0 - coord_event 87, 6, 3, 0, 8, 0, 0, 0x0 - coord_event 87, 7, 3, 0, 8, 0, 0, 0x0 + 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: @ 8529DF4 - bg_event 85, 6, 0, 0, 0, Route113_EventScript_1F219C - bg_event 12, 9, 0, 0, 0, Route113_EventScript_1F21A5 - bg_event 58, 4, 3, 0, 0, Route113_EventScript_1F21B7 - bg_event 31, 5, 0, 0, 0, Route113_EventScript_1F21AE - bg_event 49, 8, 3, 8, 0, ITEM_GREAT_BALL, 0, 0 - bg_event 66, 3, 3, 7, 0, ITEM_ETHER, 3, 0 - bg_event 22, 5, 3, 7, 0, ITEM_TM32, 30, 0 - bg_event 73, 3, 3, 7, 0, ITEM_NUGGET, 98, 0 + 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, 3 + bg_hidden_item_event 22, 5, 3, ITEM_TM32, 30 + bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, 98 Route113_MapEvents:: @ 8529E54 map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 1f25b59ca..70cabb8c5 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -35,18 +35,18 @@ Route114_MapWarps: @ 852A0F0 warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route114_MapBGEvents: @ 852A118 - bg_event 7, 64, 0, 0, 0, Route114_EventScript_1F2625 - bg_event 31, 7, 0, 0, 0, Route114_EventScript_1F262E - bg_event 9, 47, 0, 8, 0, ITEM_RED_FLUTE, 0, 0 - bg_event 30, 51, 0, 8, 0, ITEM_GREEN_SHARD, 0, 0 - bg_event 11, 62, 0, 8, 0, 61, 0, 0 - bg_event 19, 70, 0, 8, 0, ITEM_PP_MAX, 0, 0 - bg_event 11, 27, 0, 8, 0, ITEM_EXP_SHARE, 0, 0 - bg_event 12, 27, 0, 8, 0, ITEM_DEEP_SEA_TOOTH, 0, 0 - bg_event 25, 38, 3, 0, 0, Route114_EventScript_1F2637 - bg_event 20, 57, 3, 7, 0, ITEM_CARBOS, 4, 0 - bg_event 32, 57, 0, 8, 0, ITEM_GUARD_SPEC, 0, 0 - bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0 + 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, 4 + bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 + bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, 42 Route114_MapEvents:: @ 852A1A8 map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 65864133e..0a707820e 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -7,10 +7,10 @@ Route114_FossilManiacsHouse_MapWarps: @ 8533D14 warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C - bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C - bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C + 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 map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index ca6142852..ba3798f7b 100644 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -7,8 +7,8 @@ Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0 - coord_event 5, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66 - coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66 + 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 map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index a6ecd2e7f..47bd391fb 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -6,9 +6,9 @@ Route114_LanettesHouse_MapWarps: @ 8533DEC warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents: @ 8533DFC - bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B309 - bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345 - bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345 + 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 map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 29a77c6ce..36888bd7a 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -29,20 +29,20 @@ Route115_MapWarps: @ 852A3E4 warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route115_MapBGEvents: @ 852A3FC - bg_event 32, 6, 0, 8, 0, 72, 0, 0 - bg_event 21, 18, 0, 8, 0, 62, 0, 0 - bg_event 16, 64, 0, 0, 0, Route115_EventScript_1F297C - bg_event 25, 38, 3, 0, 0, Route115_EventScript_1F2985 - bg_event 8, 30, 0, 8, 0, ITEM_CHERI_BERRY, 0, 0 - bg_event 32, 39, 0, 8, 0, ITEM_BLACK_FLUTE, 0, 0 - bg_event 26, 15, 0, 8, 0, 52, 0, 0 - bg_event 23, 8, 0, 8, 0, ITEM_WHITE_FLUTE, 0, 0 - bg_event 32, 46, 0, 8, 0, 53, 0, 0 - bg_event 7, 20, 0, 8, 0, ITEM_STARF_BERRY, 0, 0 - bg_event 8, 20, 0, 8, 0, ITEM_QUICK_CLAW, 0, 0 - bg_event 25, 24, 0, 8, 0, ITEM_HP_UP, 0, 0 - bg_event 20, 53, 0, 8, 0, ITEM_HYPER_POTION, 0, 0 - bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0 + 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, 97 Route115_MapEvents:: @ 852A4A4 map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index e2ba1ad15..d81cf31ee 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -36,20 +36,20 @@ Route116_MapWarps: @ 852A758 warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route116_MapCoordEvents: @ 852A780 - coord_event 47, 9, 3, 0, VAR_0x406F, 1, 0, Route116_EventScript_1F2D95 + coord_event 47, 9, 3, VAR_0x406F, 1, Route116_EventScript_1F2D95 Route116_MapBGEvents: @ 852A790 - bg_event 5, 10, 0, 0, 0, Route116_EventScript_1F2D57 - bg_event 48, 9, 0, 0, 0, Route116_EventScript_1F2D60 - bg_event 40, 9, 0, 0, 0, Route116_EventScript_1F2D69 - bg_event 71, 4, 0, 8, 0, ITEM_FLUFFY_TAIL, 0, 0 - bg_event 79, 11, 0, 8, 0, 91, 0, 0 - bg_event 16, 12, 0, 0, 0, Route116_EventScript_1F2D72 - bg_event 29, 10, 0, 0, 0, Route116_EventScript_1F2D7B - bg_event 56, 6, 0, 8, 0, 102, 0, 0 - bg_event 55, 15, 0, 8, 0, 112, 0, 0 - bg_event 22, 9, 3, 7, 0, ITEM_SUPER_POTION, 45, 0 - bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0 + 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, 45 + bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, 96 Route116_MapEvents:: @ 852A814 map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 9747679ad..ffdb9984f 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -28,10 +28,10 @@ Route117_MapWarps: @ 852AA68 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents: @ 852AA70 - bg_event 16, 6, 0, 0, 0, Route117_EventScript_1F39B5 - bg_event 49, 12, 0, 0, 0, Route117_EventScript_1F39BE - bg_event 49, 5, 0, 0, 0, Route117_EventScript_1F39C7 - bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0 + 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, 72 Route117_MapEvents:: @ 852AAA0 map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index f49f07faa..b24e21f44 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -26,20 +26,20 @@ Route118_MapWarps: @ 852ACAC warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE Route118_MapCoordEvents: @ 852ACBC - coord_event 43, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3E8E - coord_event 44, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EAE - coord_event 45, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EC4 + 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 - bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0 - bg_event 13, 6, 0, 0, 0, Route118_EventScript_1F3E7C - bg_event 56, 8, 0, 0, 0, Route118_EventScript_1F3E85 - bg_event 67, 6, 0, 8, 0, ITEM_LUXURY_BALL, 0, 0 - bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0 - bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0 - bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0 - bg_event 31, 13, 3, 7, 0, ITEM_IRON, 67, 0 - bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0 + 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, 67 + bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, 66 Route118_MapEvents:: @ 852AD58 map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index c21f105e5..587b60904 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -48,51 +48,51 @@ Route119_MapWarps: @ 852B174 warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents: @ 852B184 - coord_event 25, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F4472 - coord_event 26, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F447D - coord_event 29, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 30, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 31, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 32, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 15, 133, 3, 0, 20, 0, 0, 0x0 - coord_event 16, 132, 3, 0, 20, 0, 0, 0x0 - coord_event 17, 131, 3, 0, 20, 0, 0, 0x0 - coord_event 18, 130, 3, 0, 20, 0, 0, 0x0 - coord_event 19, 131, 3, 0, 20, 0, 0, 0x0 - coord_event 20, 132, 3, 0, 20, 0, 0, 0x0 - coord_event 21, 133, 3, 0, 20, 0, 0, 0x0 - coord_event 36, 6, 3, 0, 2, 0, 0, 0x0 - coord_event 36, 7, 3, 0, 2, 0, 0, 0x0 - coord_event 35, 8, 3, 0, 2, 0, 0, 0x0 - coord_event 35, 9, 3, 0, 2, 0, 0, 0x0 - coord_event 16, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 17, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 18, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 19, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 20, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 34, 13, 3, 0, 20, 0, 0, 0x0 + 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: @ 852B2F4 - bg_event 9, 33, 0, 0, 0, Route119_EventScript_1F477D - bg_event 27, 19, 0, 0, 0, Route119_EventScript_1F4774 - bg_event 5, 2, 0, 8, 0, ITEM_DRAGON_SCALE, 0, 0 - bg_event 4, 89, 0, 8, 0, ITEM_LIGHT_BALL, 0, 0 - bg_event 5, 15, 0, 8, 0, ITEM_POISON_BARB, 0, 0 - bg_event 7, 101, 3, 8, 0, ITEM_NEVER_MELT_ICE, 0, 0 - bg_event 34, 24, 3, 8, 0, ITEM_LAX_INCENSE, 0, 0 - bg_event 31, 73, 3, 8, 0, 231, 0, 0 - bg_event 16, 81, 0, 8, 0, ITEM_TINY_MUSHROOM, 0, 0 - bg_event 16, 28, 0, 8, 0, 113, 0, 0 - bg_event 17, 82, 3, 7, 0, ITEM_CALCIUM, 5, 0 - bg_event 38, 63, 3, 7, 0, ITEM_ULTRA_BALL, 6, 0 - bg_event 26, 81, 0, 8, 0, ITEM_FULL_HEAL, 0, 0 - bg_event 19, 76, 0, 8, 0, ITEM_LANSAT_BERRY, 0, 0 - bg_event 18, 76, 0, 8, 0, ITEM_DEEP_SEA_SCALE, 0, 0 - bg_event 4, 15, 0, 8, 0, ITEM_METAL_POWDER, 0, 0 - bg_event 6, 2, 0, 8, 0, 233, 0, 0 - bg_event 26, 120, 3, 7, 0, ITEM_FULL_HEAL, 68, 0 - bg_event 20, 29, 3, 7, 0, ITEM_MAX_ETHER, 87, 0 - bg_event 28, 9, 0, 0, 0, Route119_EventScript_1F49E3 + 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, 5 + bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, 6 + 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, 68 + bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, 87 + bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 Route119_MapEvents:: @ 852B3E4 map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index c69d053ff..01a93f7e6 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -11,10 +11,10 @@ Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0 - bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 + 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 map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index fd79c716d..97ae62fe6 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -49,41 +49,41 @@ Route120_MapWarps: @ 852B818 warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB Route120_MapCoordEvents: @ 852B828 - coord_event 7, 15, 0, 0, 3, 0, 0, 0x0 - coord_event 7, 16, 0, 0, 3, 0, 0, 0x0 - coord_event 22, 61, 3, 0, 3, 0, 0, 0x0 - coord_event 12, 64, 3, 0, 3, 0, 0, 0x0 - coord_event 35, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 36, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 37, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 38, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 32, 88, 5, 0, 1, 0, 0, 0x0 - coord_event 28, 15, 0, 0, 2, 0, 0, 0x0 - coord_event 28, 16, 0, 0, 2, 0, 0, 0x0 - coord_event 28, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 32, 89, 5, 0, 1, 0, 0, 0x0 - coord_event 32, 90, 5, 0, 1, 0, 0, 0x0 - coord_event 32, 91, 5, 0, 1, 0, 0, 0x0 - coord_event 10, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 11, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 12, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 13, 75, 3, 0, 1, 0, 0, 0x0 + 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: @ 852B958 - bg_event 27, 3, 3, 0, 0, Route120_EventScript_1F57C5 - bg_event 38, 88, 3, 0, 0, Route120_EventScript_1F57CE - bg_event 28, 62, 0, 8, 0, 101, 0, 0 - bg_event 30, 62, 0, 8, 0, ITEM_HEART_SCALE, 0, 0 - bg_event 26, 10, 0, 8, 0, ITEM_LUCKY_PUNCH, 0, 0 - bg_event 29, 85, 5, 8, 0, 232, 0, 0 - bg_event 18, 12, 0, 8, 0, ITEM_SUN_STONE, 0, 0 - bg_event 38, 54, 0, 8, 0, ITEM_SOFT_SAND, 0, 0 - bg_event 31, 23, 0, 8, 0, ITEM_SPELL_TAG, 0, 0 - bg_event 9, 1, 3, 7, 0, ITEM_RARE_CANDY, 71, 0 - bg_event 31, 11, 3, 7, 0, ITEM_REVIVE, 84, 0 - bg_event 0, 86, 3, 7, 0, ITEM_RARE_CANDY, 69, 0 - bg_event 24, 42, 3, 7, 0, ITEM_ZINC, 70, 0 - bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0 + 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, 71 + bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, 84 + bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, 69 + bg_hidden_item_event 24, 42, 3, ITEM_ZINC, 70 + bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 Route120_MapEvents:: @ 852BA00 map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 7cafdc402..03f86df42 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -33,22 +33,22 @@ Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents: @ 852BCD4 - coord_event 25, 5, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 - coord_event 25, 6, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 - coord_event 25, 7, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 - coord_event 25, 8, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18 + 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 - bg_event 32, 14, 0, 0, 0, Route121_EventScript_1F5E06 - bg_event 40, 11, 0, 8, 0, ITEM_PREMIER_BALL, 0, 0 - bg_event 18, 13, 0, 8, 0, ITEM_SUPER_POTION, 0, 0 - bg_event 43, 7, 0, 8, 0, ITEM_NOMEL_BERRY, 0, 0 - bg_event 42, 7, 0, 8, 0, ITEM_APICOT_BERRY, 0, 0 - bg_event 39, 6, 0, 0, 0, Route121_EventScript_1F5E0F - bg_event 23, 10, 3, 7, 0, ITEM_HP_UP, 39, 0 - bg_event 58, 3, 3, 7, 0, ITEM_NUGGET, 40, 0 - bg_event 72, 5, 3, 7, 0, ITEM_FULL_HEAL, 73, 0 - bg_event 68, 8, 3, 7, 0, ITEM_MAX_REVIVE, 100, 0 + 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, 39 + bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, 40 + bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, 73 + bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, 100 Route121_MapEvents:: @ 852BD8C map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 8ac15b503..658be476f 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -10,10 +10,10 @@ Route121_SafariZoneEntrance_MapWarps: @ 8533F24 warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44 - coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_22BC18 + coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18 Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 - bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BD21 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_22BD21 Route121_SafariZoneEntrance_MapEvents:: @ 8533F60 map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index 7fafbb76a..3f17c6c3d 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -47,41 +47,41 @@ Route123_MapWarps: @ 852C1C4 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE Route123_MapCoordEvents: @ 852C1CC - coord_event 90, 16, 3, 0, 21, 0, 0, 0x0 - coord_event 92, 9, 3, 0, 21, 0, 0, 0x0 - coord_event 93, 12, 3, 0, 21, 0, 0, 0x0 - coord_event 92, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 91, 14, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 12, 3, 0, 21, 0, 0, 0x0 - coord_event 34, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 14, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 15, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 16, 3, 0, 21, 0, 0, 0x0 - coord_event 108, 14, 3, 0, 2, 0, 0, 0x0 - coord_event 109, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 110, 16, 3, 0, 2, 0, 0, 0x0 - coord_event 111, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 112, 18, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 12, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 13, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 14, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 16, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 10, 3, 0, 21, 0, 0, 0x0 + 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: @ 852C32C - bg_event 117, 10, 0, 0, 0, Route123_EventScript_1F61B3 - bg_event 47, 3, 0, 8, 0, 82, 0, 0 - bg_event 49, 3, 0, 8, 0, 92, 0, 0 - bg_event 10, 12, 3, 0, 0, Route123_EventScript_1F61AA - bg_event 75, 1, 3, 7, 0, ITEM_SUPER_REPEL, 7, 0 - bg_event 20, 7, 3, 0, 0, Route123_EventScript_1F61BC - bg_event 57, 5, 0, 8, 0, ITEM_SUPER_REPEL, 0, 0 - bg_event 12, 1, 3, 7, 0, ITEM_REVIVE, 41, 0 - bg_event 91, 15, 3, 7, 0, ITEM_HYPER_POTION, 74, 0 - bg_event 139, 15, 3, 7, 0, ITEM_PP_UP, 99, 0 - bg_event 138, 18, 3, 7, 0, ITEM_RARE_CANDY, 110, 0 + 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, 7 + 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, 41 + bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, 74 + bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, 99 + bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, 110 Route123_MapEvents:: @ 852C3B0 map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 3e4ab2780..30ff07ee9 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -16,7 +16,7 @@ Route124_MapWarps: @ 852C4E4 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents: @ 852C4EC - bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C + bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C Route124_MapEvents:: @ 852C4F8 map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index 5294f6d71..f76468efe 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -6,7 +6,7 @@ Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 warp_def 4, 8, 0, 0, MAP_ROUTE124 Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index cb13b81fa..b8ced006c 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -14,10 +14,10 @@ Route125_MapWarps: @ 852C5FC warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM Route125_MapBGEvents: @ 852C604 - bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0 - bg_event 55, 11, 0, 8, 0, ITEM_HEAL_POWDER, 0, 0 - bg_event 7, 25, 0, 8, 0, ITEM_RETRO_MAIL, 0, 0 - bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0 + 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 map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index 8f5fffa71..6a7c07b9b 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -12,11 +12,11 @@ Route127_EventObjects: @ 852C734 object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, 1155 Route127_MapBGEvents: @ 852C83C - bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 - bg_event 59, 72, 0, 8, 0, ITEM_SITRUS_BERRY, 0, 0 - bg_event 67, 63, 0, 8, 0, ITEM_WEPEAR_BERRY, 0, 0 - bg_event 61, 21, 0, 8, 0, ITEM_FIGY_BERRY, 0, 0 - bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0 + 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 map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index c4b1710fa..02d28acfd 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -11,9 +11,9 @@ Route128_EventObjects: @ 852C88C 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 - bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 - bg_event 57, 21, 3, 7, 0, ITEM_HEART_SCALE, 93, 0 - bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0 + bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, 92 + bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, 93 + bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, 94 Route128_MapEvents:: @ 852C9A0 map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index 4c70edf34..4471d06e0 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -31,39 +31,39 @@ RustboroCity_MapWarps: @ 8526960 warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents: @ 85269C0 - coord_event 23, 20, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E095A - coord_event 23, 21, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0971 - coord_event 23, 22, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0988 - coord_event 23, 23, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E099F - coord_event 23, 24, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E09B6 - coord_event 30, 9, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0AFE - coord_event 29, 10, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B0A - coord_event 30, 11, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B16 - coord_event 30, 12, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B22 - coord_event 30, 9, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C2B - coord_event 31, 10, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C37 - coord_event 30, 11, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C43 - coord_event 30, 12, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C4F - coord_event 12, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0DF3 - coord_event 13, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E33 - coord_event 14, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E73 - coord_event 15, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EB3 - coord_event 16, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EF3 - coord_event 17, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F33 - coord_event 18, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F73 - coord_event 19, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0FB3 + 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: @ 8526B10 - bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_1E08F5 - bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_1E0910 - bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_271E6A - bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_271E73 - bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_1E0907 - bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_271E6A - bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_271E73 - bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_1E08EC - bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_1E08E3 - bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_1E0919 + 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:: @ 8526B88 map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index 260d64a0d..baef1be49 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -9,8 +9,8 @@ RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC - bg_event 3, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211312 - bg_event 8, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211309 + 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 map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index 0c655b814..164391cf6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -7,8 +7,8 @@ RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C - bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600 - bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600 + 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 map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 8d6971796..0d1f57cdd 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -10,8 +10,8 @@ RustboroCity_Gym_MapWarps: @ 85305B0 warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents: @ 85305C0 - bg_event 2, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213047 - bg_event 8, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213057 + 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 map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 0fdcca3c8..84548b44a 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -12,11 +12,11 @@ RustboroCity_PokemonSchool_MapWarps: @ 8530694 warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4 - bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F8C + 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 map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index c56a5b5ee..d0d56e6fa 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -16,11 +16,11 @@ RusturfTunnel_MapWarps: @ 85342B4 warp_def 18, 20, 3, 2, MAP_ROUTE116 RusturfTunnel_MapCoordEvents: @ 85342CC - coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D071 - coord_event 9, 4, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083 - coord_event 9, 5, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083 - coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D077 - coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D07D + coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 + coord_event 9, 4, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083 + coord_event 9, 5, 3, VAR_0x409A, 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 map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index 22827aca3..8494f36e5 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -17,18 +17,18 @@ SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK SSTidalCorridor_MapBGEvents: @ 853A218 - bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D - bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0F5 - bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0FE - bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C107 - bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C110 + 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:: @ 853A2A8 map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index 9722e1df1..be32d9ad4 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -6,7 +6,7 @@ SSTidalLowerDeck_MapWarps: @ 853A2EC warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents: @ 853A2F4 - bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 + bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, 35 SSTidalLowerDeck_MapEvents:: @ 853A300 map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index 0e038f0f9..5ef669f48 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -23,8 +23,8 @@ SSTidalRooms_MapWarps: @ 853A3D4 warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR SSTidalRooms_MapBGEvents: @ 853A434 - bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_23CA33 - bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33 + 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 map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index 38f59ff13..a3d1ad0a3 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -10,8 +10,8 @@ SafariZone_Northeast_EventObjects: @ 853B968 object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169 SafariZone_Northeast_MapBGEvents: @ 853BA40 - bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0 - bg_event 21, 5, 3, 7, 0, ITEM_ZINC, 107, 0 + bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, 106 + bg_hidden_item_event 21, 5, 3, ITEM_ZINC, 107 SafariZone_Northeast_MapEvents:: @ 853BA58 map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index f7f38f7af..3ba71ee8e 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -6,8 +6,8 @@ SafariZone_Southeast_EventObjects: @ 853BA6C object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747 SafariZone_Southeast_MapBGEvents: @ 853BAE4 - bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0 - bg_event 32, 33, 0, 7, 0, ITEM_FULL_RESTORE, 105, 0 + bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, 108 + bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, 105 SafariZone_Southeast_MapEvents:: @ 853BAFC map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index 886958342..468a0013d 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -6,7 +6,7 @@ SafariZone_Southwest_MapWarps: @ 853B27C warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents: @ 853B284 - bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270 + bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_23D270 SafariZone_Southwest_MapEvents:: @ 853B290 map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index 659ca8b03..2fb2d069b 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -11,7 +11,7 @@ SeafloorCavern_Room9_MapWarps: @ 8535CF0 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8 - coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9 + coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9 SeafloorCavern_Room9_MapEvents:: @ 8535D08 map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc index dd331570e..ddd6c15ec 100644 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -2,15 +2,15 @@ SealedChamber_InnerRoom_MapWarps: @ 8536F00 warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 - bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239255 - bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23925F - bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239269 - bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239273 - bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23927D - bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239287 - bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8 + 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:: @ 8536F74 map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc index 0181f3193..3cd1b9714 100644 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -2,35 +2,35 @@ SealedChamber_OuterRoom_MapWarps: @ 8536D88 warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 - bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C - bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176 - bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180 - bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A - bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194 - bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E - bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391B2 - bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391C6 - bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391D0 - bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176 - bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176 - bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180 - bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180 - bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A - bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A - bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194 - bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194 - bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E - bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E - bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED - bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED + 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:: @ 8536EEC map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 5743c8c22..543a7d02b 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -12,12 +12,12 @@ ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 - bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23708C - bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2370C8 - bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FBA - bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FF6 - bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_237028 - bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23705A + 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:: @ 8536380 map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index 8b0cc9b40..dabb85971 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C - bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176 + bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_237176 ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438 map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index b9e6955ae..b6af468c5 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -6,7 +6,7 @@ ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC - bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A + bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_23711A ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8 map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index 6971d4217..c0bcde1ba 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -6,8 +6,8 @@ SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents: @ 8539D6C - coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277374 - coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E + 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 map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index 79973b316..9271dd4d3 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -6,7 +6,7 @@ SkyPillar_Top_MapWarps: @ 85371A0 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F SkyPillar_Top_MapCoordEvents: @ 85371A8 - coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A + coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A SkyPillar_Top_MapEvents:: @ 85371B8 map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 3b72a57f3..8b74573b7 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -49,22 +49,22 @@ SlateportCity_MapWarps: @ 8526514 warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 SlateportCity_MapCoordEvents: @ 852656C - coord_event 10, 13, 3, 0, VAR_0x40D2, 2, 0, SlateportCity_EventScript_1DD5DC + coord_event 10, 13, 3, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC SlateportCity_MapBGEvents: @ 852657C - bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_1DCFB2 - bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_271E73 - bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_271E73 - bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_271E6A - bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_1DCF94 - bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_271E6A - bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_1DCF8B - bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_1DCF79 - bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_1DCF82 - bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_1DCF70 - bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_1DCF36 - bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_1DCF3F - bg_event 10, 36, 0, 1, 0, SlateportCity_EventScript_1DD643 + 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:: @ 8526618 map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc index d0875ba78..c5c60ba6d 100644 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ b/data/maps/SlateportCity_BattleTentLobby/events.inc @@ -10,7 +10,7 @@ SlateportCity_BattleTentLobby_MapWarps: @ 852F480 warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490 - bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99 + bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_BattleTentLobby_EventScript_208A99 SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index 5f6e2617f..ba5f25d98 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -15,10 +15,10 @@ SlateportCity_Harbor_MapWarps: @ 852FB28 warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents: @ 852FB48 - coord_event 8, 11, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9BB - coord_event 8, 12, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9C7 - coord_event 8, 13, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9D3 - coord_event 8, 14, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9DF + 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 map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index aca75a698..256b2ee1c 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -20,23 +20,23 @@ SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8 - coord_event 9, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F - coord_event 10, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0 + 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 - bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE83 - bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0 - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9 - bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB - bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB + 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:: @ 852F894 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_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index 9c695f745..7b407d5d2 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -11,27 +11,27 @@ SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD13 - bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 + 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:: @ 852FA54 map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index b7d481ac3..7361ccc21 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -34,12 +34,12 @@ SootopolisCity_MapWarps: @ 85274C4 warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F SootopolisCity_MapBGEvents: @ 852752C - bg_event 33, 34, 3, 0, 0, SootopolisCity_EventScript_1E614B - bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A - bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_271E73 - bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_271E73 - bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A - bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_1E6154 + 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:: @ 8527574 map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index ee78e053a..36d8d7b27 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -8,8 +8,8 @@ SootopolisCity_Gym_1F_MapWarps: @ 8533024 warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F SootopolisCity_Gym_1F_MapBGEvents: @ 853303C - bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_22505F - bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_22506F + 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 map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc index 8d0512952..07c18bae5 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc @@ -7,8 +7,8 @@ SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C - bg_event 5, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D - bg_event 2, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B + 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 map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index d204708db..14dc7169b 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -7,7 +7,7 @@ SouthernIsland_Exterior_MapWarps: @ 853B86C warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents: @ 853B87C - bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C + bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_242A3C SouthernIsland_Exterior_MapEvents:: @ 853B888 map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index 55bfeb614..b65134679 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -7,7 +7,7 @@ SouthernIsland_Interior_MapWarps: @ 853B8CC warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents: @ 853B8DC - bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4 + bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_242AC4 SouthernIsland_Interior_MapEvents:: @ 853B8E8 map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc index b47a00441..aa23659eb 100644 --- a/data/maps/TerraCave_End/events.inc +++ b/data/maps/TerraCave_End/events.inc @@ -5,7 +5,7 @@ TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE TerraCave_End_MapCoordEvents: @ 8537870 - coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC + coord_event 17, 26, 3, VAR_TEMP_1, 1, TerraCave_End_EventScript_23B0EC TerraCave_End_MapEvents:: @ 8537880 map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index a2156ff48..e1f2e2bea 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -6,8 +6,8 @@ TradeCenter_MapWarps: @ 8539DB8 warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents: @ 8539DC8 - coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773F5 - coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF + 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 map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc index 8cb0b43b9..ae11a879e 100644 --- a/data/maps/TrainerHill_Entrance/events.inc +++ b/data/maps/TrainerHill_Entrance/events.inc @@ -11,10 +11,10 @@ TrainerHill_Entrance_MapWarps: @ 853D8EC warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F TrainerHill_Entrance_MapCoordEvents: @ 853D904 - coord_event 9, 6, 3, 0, VAR_0x40D6, 0, 0, TrainerHill_Entrance_EventScript_268229 + coord_event 9, 6, 3, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229 TrainerHill_Entrance_MapBGEvents: @ 853D914 - bg_event 8, 10, 0, 1, 0, TrainerHill_Entrance_EventScript_268388 + bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, TrainerHill_Entrance_EventScript_268388 TrainerHill_Entrance_MapEvents:: @ 853D920 map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc index 08cf19a4c..102a5f6e7 100644 --- a/data/maps/Underwater1/events.inc +++ b/data/maps/Underwater1/events.inc @@ -1,11 +1,11 @@ Underwater1_MapBGEvents: @ 852CEB4 - bg_event 42, 51, 0, 7, 0, ITEM_CARBOS, 8, 0 - bg_event 14, 40, 0, 7, 0, ITEM_GREEN_SHARD, 9, 0 - bg_event 66, 34, 3, 7, 0, ITEM_PEARL, 10, 0 - bg_event 64, 54, 3, 7, 0, ITEM_BIG_PEARL, 11, 0 - bg_event 70, 64, 3, 7, 0, ITEM_HEART_SCALE, 13, 0 - bg_event 42, 5, 3, 7, 0, ITEM_CALCIUM, 36, 0 - bg_event 45, 36, 3, 7, 0, ITEM_HEART_SCALE, 38, 0 + bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, 8 + bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, 9 + bg_hidden_item_event 66, 34, 3, ITEM_PEARL, 10 + bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, 11 + bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, 13 + bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, 36 + bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, 38 Underwater1_MapEvents:: @ 852CF08 map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc index 416e9fe86..ca98f25ac 100644 --- a/data/maps/Underwater2/events.inc +++ b/data/maps/Underwater2/events.inc @@ -2,14 +2,14 @@ Underwater2_MapWarps: @ 852CF1C warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents: @ 852CF24 - bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0 - bg_event 41, 19, 3, 7, 0, ITEM_ULTRA_BALL, 15, 0 - bg_event 63, 19, 3, 7, 0, ITEM_STARDUST, 16, 0 - bg_event 10, 36, 3, 7, 0, ITEM_PEARL, 17, 0 - bg_event 11, 39, 3, 7, 0, ITEM_IRON, 19, 0 - bg_event 12, 35, 3, 7, 0, ITEM_YELLOW_SHARD, 18, 0 - bg_event 65, 60, 3, 7, 0, ITEM_BIG_PEARL, 20, 0 - bg_event 9, 77, 3, 7, 0, ITEM_BLUE_SHARD, 12, 0 + bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, 14 + bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, 15 + bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, 16 + bg_hidden_item_event 10, 36, 3, ITEM_PEARL, 17 + bg_hidden_item_event 11, 39, 3, ITEM_IRON, 19 + bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, 18 + bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, 20 + bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, 12 Underwater2_MapEvents:: @ 852CF84 map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc index ba8ed9508..0a5dc773d 100644 --- a/data/maps/Underwater3/events.inc +++ b/data/maps/Underwater3/events.inc @@ -3,10 +3,10 @@ Underwater3_MapWarps: @ 852CF98 warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater3_MapBGEvents: @ 852CFA8 - bg_event 12, 42, 3, 7, 0, ITEM_STAR_PIECE, 21, 0 - bg_event 50, 36, 3, 7, 0, ITEM_HP_UP, 22, 0 - bg_event 34, 72, 3, 7, 0, ITEM_HEART_SCALE, 23, 0 - bg_event 72, 20, 3, 7, 0, ITEM_RED_SHARD, 24, 0 + bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, 21 + bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, 22 + bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, 23 + bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, 24 Underwater3_MapEvents:: @ 852CFD8 map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc index 5f8b99b64..7799e0ad6 100644 --- a/data/maps/Underwater4/events.inc +++ b/data/maps/Underwater4/events.inc @@ -2,8 +2,8 @@ Underwater4_MapWarps: @ 852CFEC warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents: @ 852CFF4 - bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0 - bg_event 69, 18, 3, 7, 0, ITEM_PEARL, 26, 0 + bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, 25 + bg_hidden_item_event 69, 18, 3, ITEM_PEARL, 26 Underwater4_MapEvents:: @ 852D00C map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc index 350cca5d6..e0bb19642 100644 --- a/data/maps/Underwater_SealedChamber/events.inc +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -2,7 +2,7 @@ Underwater_SealedChamber_MapWarps: @ 8536D60 warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents: @ 8536D68 - bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_2390FC + bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_2390FC Underwater_SealedChamber_MapEvents:: @ 8536D74 map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index 0a871136f..f87467d19 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -14,14 +14,14 @@ VerdanturfTown_MapWarps: @ 8527D3C warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE VerdanturfTown_MapBGEvents: @ 8527D74 - bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A - bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_1EB5D9 - bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73 - bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_1EB5E2 - bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A - bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73 - bg_event 1, 8, 0, 0, 0, VerdanturfTown_EventScript_1EB5EB - bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_1EB5F4 + 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:: @ 8527DD4 map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc index 4b9b254a8..1c4bafba9 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc @@ -11,7 +11,7 @@ VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8 - bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02 + bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_BattleTentLobby_EventScript_201B02 VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4 map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index 0c94c31a2..3df6ff6b0 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -17,11 +17,11 @@ VictoryRoad_1F_MapWarps: @ 8535EDC warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents: @ 8535F04 - coord_event 2, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DAF - coord_event 3, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DC8 + 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 - bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 + bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, 81 VictoryRoad_1F_MapEvents:: @ 8535F30 map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index ca7719bd7..bcd5747f7 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -14,8 +14,8 @@ VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F VictoryRoad_B2F_MapBGEvents: @ 8536250 - bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0 - bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0 + bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, 82 + bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, 83 VictoryRoad_B2F_MapEvents:: @ 8536268 map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/include/constants/bg_event_constants.h b/include/constants/bg_event_constants.h new file mode 100755 index 000000000..a915bc509 --- /dev/null +++ b/include/constants/bg_event_constants.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_BG_EVENT_H +#define GUARD_CONSTANTS_BG_EVENT_H + +#define BG_EVENT_PLAYER_FACING_ANY 0 +#define BG_EVENT_PLAYER_FACING_NORTH 1 +#define BG_EVENT_PLAYER_FACING_SOUTH 2 +#define BG_EVENT_PLAYER_FACING_EAST 3 +#define BG_EVENT_PLAYER_FACING_WEST 4 + +#define BG_EVENT_HIDDEN_ITEM 7 +#define BG_EVENT_SECRET_BASE 8 + +#endif // GUARD_CONSTANTS_BG_EVENT_H diff --git a/include/constants/secret_bases.h b/include/constants/secret_bases.h new file mode 100755 index 000000000..0f51054a8 --- /dev/null +++ b/include/constants/secret_bases.h @@ -0,0 +1,110 @@ +#ifndef GUARD_CONSTANTS_SECRET_BASES_H +#define GUARD_CONSTANTS_SECRET_BASES_H + +// Each secret base location is assigned an identifier value. +// The secret base's map is determined by (id / 10). The ones +// digit is used to differentiate secret bases using the same map. +// Therefore, each secret base map can be used by up to 10 different +// secret bases in the game. These ids are 1-based, but there is no +// apparent reason for that. + +#define SECRET_BASE_RED_CAVE1_1 1 +#define SECRET_BASE_RED_CAVE1_2 2 +#define SECRET_BASE_RED_CAVE1_3 3 + +#define SECRET_BASE_RED_CAVE2_1 11 +#define SECRET_BASE_RED_CAVE2_2 12 +#define SECRET_BASE_RED_CAVE2_3 13 + +#define SECRET_BASE_RED_CAVE3_1 21 +#define SECRET_BASE_RED_CAVE3_2 22 +#define SECRET_BASE_RED_CAVE3_3 23 + +#define SECRET_BASE_RED_CAVE4_1 31 +#define SECRET_BASE_RED_CAVE4_2 32 +#define SECRET_BASE_RED_CAVE4_3 33 + +#define SECRET_BASE_BROWN_CAVE1_1 41 +#define SECRET_BASE_BROWN_CAVE1_2 42 +#define SECRET_BASE_BROWN_CAVE1_3 43 + +#define SECRET_BASE_BROWN_CAVE2_1 51 +#define SECRET_BASE_BROWN_CAVE2_2 52 +#define SECRET_BASE_BROWN_CAVE2_3 53 + +#define SECRET_BASE_BROWN_CAVE3_1 61 +#define SECRET_BASE_BROWN_CAVE3_2 62 +#define SECRET_BASE_BROWN_CAVE3_3 63 + +#define SECRET_BASE_BROWN_CAVE4_1 71 +#define SECRET_BASE_BROWN_CAVE4_2 72 +#define SECRET_BASE_BROWN_CAVE4_3 73 + +#define SECRET_BASE_BLUE_CAVE1_1 81 +#define SECRET_BASE_BLUE_CAVE1_2 82 +#define SECRET_BASE_BLUE_CAVE1_3 83 + +#define SECRET_BASE_BLUE_CAVE2_1 91 +#define SECRET_BASE_BLUE_CAVE2_2 92 +#define SECRET_BASE_BLUE_CAVE2_3 93 + +#define SECRET_BASE_BLUE_CAVE3_1 101 +#define SECRET_BASE_BLUE_CAVE3_2 102 +#define SECRET_BASE_BLUE_CAVE3_3 103 + +#define SECRET_BASE_BLUE_CAVE4_1 111 +#define SECRET_BASE_BLUE_CAVE4_2 112 +#define SECRET_BASE_BLUE_CAVE4_3 113 + +#define SECRET_BASE_YELLOW_CAVE1_1 121 +#define SECRET_BASE_YELLOW_CAVE1_2 122 +#define SECRET_BASE_YELLOW_CAVE1_3 123 + +#define SECRET_BASE_YELLOW_CAVE2_1 131 +#define SECRET_BASE_YELLOW_CAVE2_2 132 +#define SECRET_BASE_YELLOW_CAVE2_3 133 + +#define SECRET_BASE_YELLOW_CAVE3_1 141 +#define SECRET_BASE_YELLOW_CAVE3_2 142 +#define SECRET_BASE_YELLOW_CAVE3_3 143 + +#define SECRET_BASE_YELLOW_CAVE4_1 151 +#define SECRET_BASE_YELLOW_CAVE4_2 152 +#define SECRET_BASE_YELLOW_CAVE4_3 153 + +#define SECRET_BASE_TREE1_1 161 +#define SECRET_BASE_TREE1_2 162 +#define SECRET_BASE_TREE1_3 163 +#define SECRET_BASE_TREE1_4 164 + +#define SECRET_BASE_TREE2_1 171 +#define SECRET_BASE_TREE2_2 172 +#define SECRET_BASE_TREE2_3 173 +#define SECRET_BASE_TREE2_4 174 + +#define SECRET_BASE_TREE3_1 181 +#define SECRET_BASE_TREE3_2 182 +#define SECRET_BASE_TREE3_3 183 + +#define SECRET_BASE_TREE4_1 191 +#define SECRET_BASE_TREE4_2 192 +#define SECRET_BASE_TREE4_3 193 + +#define SECRET_BASE_SHRUB1_1 201 +#define SECRET_BASE_SHRUB1_2 202 +#define SECRET_BASE_SHRUB1_3 203 +#define SECRET_BASE_SHRUB1_4 204 + +#define SECRET_BASE_SHRUB2_1 211 +#define SECRET_BASE_SHRUB2_2 212 +#define SECRET_BASE_SHRUB2_3 213 + +#define SECRET_BASE_SHRUB3_1 221 +#define SECRET_BASE_SHRUB3_2 222 +#define SECRET_BASE_SHRUB3_3 223 + +#define SECRET_BASE_SHRUB4_1 231 +#define SECRET_BASE_SHRUB4_2 232 +#define SECRET_BASE_SHRUB4_3 233 + +#endif // GUARD_CONSTANTS_SECRET_BASES_H diff --git a/src/item_use.c b/src/item_use.c index 6bdfe1c54..9031338dd 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -5,6 +5,7 @@ #include "berry.h" #include "bike.h" #include "coins.h" +#include "constants/bg_event_constants.h" #include "constants/flags.h" #include "constants/items.h" #include "constants/songs.h" @@ -371,7 +372,7 @@ bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *events, u8 taskId) gTasks[taskId].data[2] = FALSE; for (i = 0; i < events->bgEventCount; i++) { - if (events->bgEvents[i].kind == 7 && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4)) + if (events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4)) { distanceX = (u16)events->bgEvents[i].x + 7; newDistanceX = distanceX - x; @@ -398,7 +399,7 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y) for (i = 0; i < bgEventCount; i++) { - if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed? + if (bgEvent[i].kind == BG_EVENT_HIDDEN_ITEM && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed? { if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4)) return TRUE; diff --git a/src/secret_base.c b/src/secret_base.c index 93b82b3cb..b2fd54eb8 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1,6 +1,7 @@ // Includes #include "global.h" +#include "constants/bg_event_constants.h" #include "constants/decorations.h" #include "malloc.h" #include "main.h" @@ -335,7 +336,7 @@ void sub_80E8EE0(struct MapEvents const *events) for (bgEventIndex = 0; bgEventIndex < events->bgEventCount; bgEventIndex ++) { - if (events->bgEvents[bgEventIndex].kind == 8) + if (events->bgEvents[bgEventIndex].kind == BG_EVENT_SECRET_BASE) { for (j = 0; j < 20; j ++) { @@ -600,7 +601,7 @@ void sub_80E9608(struct Coords16 *coords, struct MapEvents *events) for (bgEventIdx = 0; bgEventIdx < events->bgEventCount; bgEventIdx ++) { - if (events->bgEvents[bgEventIdx].kind == 8 && coords->x == events->bgEvents[bgEventIdx].x + 7 && coords->y == events->bgEvents[bgEventIdx].y + 7) + if (events->bgEvents[bgEventIdx].kind == BG_EVENT_SECRET_BASE && coords->x == events->bgEvents[bgEventIdx].x + 7 && coords->y == events->bgEvents[bgEventIdx].y + 7) { sCurSecretBaseId = events->bgEvents[bgEventIdx].bgUnion.secretBaseId; break; @@ -780,7 +781,7 @@ void sub_80E9AD0(void) events = gMapHeader.events; for (i = 0; i < events->bgEventCount; i ++) { - if (events->bgEvents[i].kind == 8 && gSaveBlock1Ptr->secretBases[0].secretBaseId == events->bgEvents[i].bgUnion.secretBaseId) + if (events->bgEvents[i].kind == BG_EVENT_SECRET_BASE && gSaveBlock1Ptr->secretBases[0].secretBaseId == events->bgEvents[i].bgUnion.secretBaseId) { tile = MapGridGetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7); for (j = 0; j < 7; j ++) -- cgit v1.2.3 From d5eb94330a9c626aaf72b5e5d44f7aaf1da0d00c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 21:47:04 -0500 Subject: Use region map section constants in map headers --- data/maps.s | 1 + data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap1/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap2/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidTop/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerElevator/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- data/maps/BattleFrontier_OutsideEast/header.inc | 2 +- data/maps/BattleFrontier_OutsideWest/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_1F/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_2F/header.inc | 2 +- data/maps/BattleFrontier_RankingHall/header.inc | 2 +- data/maps/BattleFrontier_ReceptionGate/header.inc | 2 +- data/maps/BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_2F/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/FallarborTown_BattleTentCorridor/header.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreElevator/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_3F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_4F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- data/maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- data/maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- data/maps/Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- data/maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_BattleTentBattleRoom/header.inc | 2 +- data/maps/SlateportCity_BattleTentCorridor/header.inc | 2 +- data/maps/SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_1F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentCorridor/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentLobby/header.inc | 2 +- data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- 519 files changed, 519 insertions(+), 518 deletions(-) diff --git a/data/maps.s b/data/maps.s index 91c108c7a..8a0c2d43a 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,4 +1,5 @@ #include "constants/maps.h" +#include "constants/region_map_sections.h" #include "constants/songs.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 0348798fc..a07a66947 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -5,7 +5,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .4byte 0x0 .2byte MUS_DAN02 .2byte 195 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 2ce374617..118d91860 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Corridors_1F: @ 84844C4 .4byte 0x0 .2byte MUS_DAN02 .2byte 187 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index e8d5fc419..6b743af3a 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC .4byte 0x0 .2byte MUS_DAN02 .2byte 189 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index cac71c430..da8f1f124 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Deck: @ 84844A8 .4byte 0x0 .2byte MUS_DAN02 .2byte 186 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index c03eba0b8..e83f9a020 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -5,7 +5,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .4byte 0x0 .2byte MUS_DAN02 .2byte 289 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index efa3a0bb9..b6b48d652 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -5,7 +5,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .4byte 0x0 .2byte MUS_DAN02 .2byte 310 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index e2021ea85..3282054cb 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Room_B1F: @ 848456C .4byte 0x0 .2byte MUS_DAN02 .2byte 193 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 227bf3e8f..4d5eead34 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_1F: @ 8484588 .4byte 0x0 .2byte MUS_DAN02 .2byte 194 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 55d228f47..ddac73f8e 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .4byte 0x0 .2byte MUS_DAN02 .2byte 191 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 62991d12e..304180955 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms_1F: @ 84844E0 .4byte 0x0 .2byte MUS_DAN02 .2byte 188 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 7838b8875..b9be9d667 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms_B1F: @ 8484518 .4byte 0x0 .2byte MUS_DAN02 .2byte 190 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index cc9db3443..e73f1c5d9 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Underwater1: @ 8484550 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 192 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 14 .byte 5 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index 87650f5b2..cb7f00a6f 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Underwater2: @ 84845C0 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 196 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 14 .byte 5 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 2361bf769..1c390ec99 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -5,7 +5,7 @@ AlteringCave: @ 8484A58 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 420 - .byte 210 + .byte MAPSEC_ALTERING_CAVE_2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 5e958c6bd..5cce523f9 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -5,7 +5,7 @@ AncientTomb: @ 8484630 .4byte 0x0 .2byte MUS_MABOROSI .2byte 281 - .byte 83 + .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index afbba5738..31085dd4c 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -5,7 +5,7 @@ AquaHideout_1F: @ 8484144 .4byte 0x0 .2byte MUS_AJITO .2byte 143 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 079c18ee9..984d16740 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -5,7 +5,7 @@ AquaHideout_B1F: @ 8484160 .4byte 0x0 .2byte MUS_AJITO .2byte 144 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 8089a1634..230c2b7d0 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -5,7 +5,7 @@ AquaHideout_B2F: @ 848417C .4byte 0x0 .2byte MUS_AJITO .2byte 145 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index a643b729e..c2dc76096 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -5,7 +5,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .4byte 0x0 .2byte MUS_AJITO .2byte 316 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index bb82dba18..cc01983a9 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -5,7 +5,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .4byte 0x0 .2byte MUS_AJITO .2byte 317 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index 1fa34aab4..8adc7f2ba 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -5,7 +5,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .4byte 0x0 .2byte MUS_AJITO .2byte 318 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index a8d91737e..33d974804 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -5,7 +5,7 @@ ArtisanCave_1F: @ 84849B0 .4byte 0x0 .2byte MUS_DAN01 .2byte 401 - .byte 202 + .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index a82cd93f6..8ff225a8e 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -5,7 +5,7 @@ ArtisanCave_B1F: @ 8484994 .4byte 0x0 .2byte MUS_DAN01 .2byte 400 - .byte 202 + .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 7a8afda58..927137cf0 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .4byte 0x0 .2byte MUS_B_ARENA .2byte 356 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index 5312dd0fe..332363738 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .4byte 0x0 .2byte MUS_B_ARENA .2byte 355 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 3f5e0ff4e..541613f53 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C .4byte 0x0 .2byte MUS_B_ARENA .2byte 354 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 3edfad730..6ddf3fb45 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .4byte 0x0 .2byte MUS_B_DOME .2byte 335 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 133115e33..25c5d684f 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .4byte 0x0 .2byte MUS_B_DOME1 .2byte 333 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 26813d1f1..be93189ab 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .4byte 0x0 .2byte MUS_B_DOME1 .2byte 332 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index e25a62ce8..592300353 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .4byte 0x0 .2byte MUS_B_DOME .2byte 334 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index f3050926a..c672d86cd 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .4byte 0x0 .2byte MUS_B_FACTORY .2byte 348 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 7da242183..1fa0645a3 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .4byte 0x0 .2byte MUS_B_FACTORY .2byte 346 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index eb6e06a0f..766e9689b 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .4byte 0x0 .2byte MUS_B_FACTORY .2byte 347 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index b03d993fa..696e41601 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .4byte 0x0 .2byte MUS_B_PALACE .2byte 344 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index 4b62687e7..18ddced68 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .4byte 0x0 .2byte MUS_B_PALACE .2byte 343 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 8104eadfc..cc723eb42 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .4byte 0x0 .2byte MUS_B_PALACE .2byte 342 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index a2b84a22c..955b0be42 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .4byte 0x0 .2byte MUS_B_TUBE .2byte 350 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index 96d249ab9..e75761bed 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .4byte 0x0 .2byte MUS_B_TUBE .2byte 349 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index 58a662bb3..e5ea8a3ef 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .4byte 0x0 .2byte MUS_B_TUBE .2byte 352 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 5dde0fc15..8111043c6 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .4byte 0x0 .2byte MUS_B_TUBE .2byte 353 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 1d8848d23..2395feb52 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .4byte 0x0 .2byte MUS_B_TUBE .2byte 358 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index b1178e0a0..f6b0e6351 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .4byte 0x0 .2byte MUS_B_TUBE .2byte 351 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 069dc6f76..fca127f5f 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .4byte 0x0 .2byte MUS_B_TOWER .2byte 398 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index f2eccb9f4..a5eda44ef 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .4byte 0x0 .2byte 65535 .2byte 361 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index ed68e86c7..06fd632f8 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .4byte 0x0 .2byte MUS_PYRAMID .2byte 360 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 9e9508e7e..140a5d4e8 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .4byte 0x0 .2byte 65535 .2byte 378 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 32b789720..fdf167b9f 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .4byte 0x0 .2byte MUS_SATTOWER .2byte 268 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index a9eb2b2c5..157a9f0ae 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .4byte 0x0 .2byte MUS_SATTOWER .2byte 268 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index 361e6be03..de71a7dc6 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .4byte 0x0 .2byte MUS_SATTOWER .2byte 267 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index ccdcb013f..1ba6d43c9 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .4byte 0x0 .2byte MUS_SATTOWER .2byte 391 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index 112c7f938..d3e6216d2 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .4byte 0x0 .2byte MUS_SATTOWER .2byte 266 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 6e0e3b470..db62f0be3 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .4byte 0x0 .2byte MUS_SATTOWER .2byte 264 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index cc55ae591..5a25ffafa 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .4byte 0x0 .2byte MUS_SATTOWER .2byte 390 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 44acc4b6a..21e01eb7d 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge1: @ 84855B8 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index 69a6dba30..ad875cc4e 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge2: @ 84855F0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 397 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 3a18ce347..8ce5169d7 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge3: @ 848560C .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index e052e6ce6..11f40472b 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge4: @ 8485628 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index a6fa1470f..743ccd512 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge5: @ 8485660 .4byte 0x0 .2byte MUS_B_TOWER .2byte 397 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index ec6cfb105..b6192f8a9 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge6: @ 848567C .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 5124822a8..96843d502 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge7: @ 8485698 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 46fe25e2d..9a320a4bf 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge8: @ 84856D0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 24e7b3005..999ba6ce0 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge9: @ 84856EC .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 1067fc70c..2285a9e3f 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Mart: @ 8485740 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index f9dc82cba..0f49f1e4b 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -5,7 +5,7 @@ BattleFrontier_OutsideEast: @ 84852C4 .4byte BattleFrontier_OutsideEast_MapConnections .2byte MUS_B_FRONTIER .2byte 345 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 3 diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 319ecec6a..bbef1d1c7 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -5,7 +5,7 @@ BattleFrontier_OutsideWest: @ 84851AC .4byte BattleFrontier_OutsideWest_MapConnections .2byte MUS_B_FRONTIER .2byte 265 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 3 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 22e3ff616..2b39d2cf6 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 361c58a04..740141748 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 340ba9597..8036032e3 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -5,7 +5,7 @@ BattleFrontier_RankingHall: @ 848559C .4byte 0x0 .2byte MUS_BIJYUTU .2byte 396 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 8f395bae4..236698cd2 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -5,7 +5,7 @@ BattleFrontier_ReceptionGate: @ 84856B4 .4byte 0x0 .2byte MUS_B_TOWER .2byte 399 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index f0e0be773..b7468a9d2 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -5,7 +5,7 @@ BattleFrontier_ScottsHouse: @ 8485644 .4byte 0x0 .2byte MUS_B_TOWER .2byte 430 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index 7ed6b181b..dc3deeb48 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare01: @ 8484F60 .4byte 0x0 .2byte 65535 .2byte 362 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 9eb6ef754..8d65a6fa6 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare02: @ 8484F7C .4byte 0x0 .2byte 65535 .2byte 363 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 3f07295ae..c3bf3376d 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare03: @ 8484F98 .4byte 0x0 .2byte 65535 .2byte 364 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 978c4f466..c001abc53 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare04: @ 8484FB4 .4byte 0x0 .2byte 65535 .2byte 365 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index 09a7e4703..e96d7cac7 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare05: @ 8484FD0 .4byte 0x0 .2byte 65535 .2byte 366 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index e99531da8..440eac549 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare06: @ 8484FEC .4byte 0x0 .2byte 65535 .2byte 367 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 13c23c24b..f467dfd7d 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare07: @ 8485008 .4byte 0x0 .2byte 65535 .2byte 368 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index a12b6016e..00c45e577 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare08: @ 8485024 .4byte 0x0 .2byte 65535 .2byte 369 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 486c74bc0..27a33d4b0 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare09: @ 8485040 .4byte 0x0 .2byte 65535 .2byte 370 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index a73718125..1507f0518 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare10: @ 848505C .4byte 0x0 .2byte 65535 .2byte 371 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index eac3cb1c7..98c08a116 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare11: @ 8485078 .4byte 0x0 .2byte 65535 .2byte 372 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index a1d5585c8..39cc4061a 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare12: @ 8485094 .4byte 0x0 .2byte 65535 .2byte 373 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index 1c67b55e7..b4b1a281d 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare13: @ 84850B0 .4byte 0x0 .2byte 65535 .2byte 374 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 9dcea14fa..407cf0024 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare14: @ 84850CC .4byte 0x0 .2byte 65535 .2byte 375 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 0429cbb0b..37d8c75cb 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare15: @ 84850E8 .4byte 0x0 .2byte 65535 .2byte 376 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index ea4627aa5..f264ace73 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare16: @ 8485104 .4byte 0x0 .2byte 65535 .2byte 377 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 069bbc99c..04a62dd6b 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -5,7 +5,7 @@ BirthIsland_Exterior: @ 8485794 .4byte 0x0 .2byte 65535 .2byte 404 - .byte 200 + .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index e9dc265f5..e3b8a21f3 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -5,7 +5,7 @@ BirthIsland_Harbor: @ 84857B0 .4byte 0x0 .2byte 65535 .2byte 405 - .byte 200 + .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 0fa252cc5..c25c0d82b 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_1F: @ 84842E8 .4byte 0x0 .2byte MUS_DAN03 .2byte 158 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 629806ad6..b5eacd7d9 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B1F: @ 8484358 .4byte 0x0 .2byte 65535 .2byte 162 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 6 .byte 4 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index b3e4dea97..5cda3da60 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_Entrance: @ 84842CC .4byte 0x0 .2byte MUS_DAN03 .2byte 157 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 1edd4c6c2..762fb4115 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .4byte 0x0 .2byte MUS_DAN03 .2byte 159 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 6b046b61a..bd77221f6 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .4byte 0x0 .2byte MUS_DAN03 .2byte 160 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 6 .byte 4 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 819afc08f..a5597e4e9 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .4byte 0x0 .2byte MUS_DAN03 .2byte 161 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 6 .byte 4 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 8f076bf77..009a279e1 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -5,7 +5,7 @@ DesertRuins: @ 8483F68 .4byte 0x0 .2byte MUS_MABOROSI .2byte 131 - .byte 82 + .byte MAPSEC_DESERT_RUINS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 2a420d703..9d4bec918 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -5,7 +5,7 @@ DesertUnderpass: @ 8484978 .4byte 0x0 .2byte MUS_TOZAN .2byte 389 - .byte 209 + .byte MAPSEC_DESERT_UNDERPASS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 7c6638aed..c6fb45581 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -5,7 +5,7 @@ DewfordTown: @ 84825EC .4byte DewfordTown_MapConnections .2byte MUS_HIGHTOWN .2byte 12 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index fcb55ee29..24866ee7a 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -5,7 +5,7 @@ DewfordTown_Gym: @ 8482C60 .4byte 0x0 .2byte MUS_GIM .2byte 65 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 31af0f14d..dfa5daf1f 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -5,7 +5,7 @@ DewfordTown_Hall: @ 8482C7C .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 66 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index c317b12bb..94c735b59 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -5,7 +5,7 @@ DewfordTown_House1: @ 8482C0C .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 64 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 6d285c437..c27122bc5 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -5,7 +5,7 @@ DewfordTown_House2: @ 8482C98 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 67 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 99d29f69c..e7b628503 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 4d6a71785..90ec683d7 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index d8275de59..05949ab05 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -5,7 +5,7 @@ DoubleBattleColosseum: @ 8484D84 .4byte 0x0 .2byte MUS_RAINBOW .2byte 224 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 890d8b79f..7ba0b694b 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -5,7 +5,7 @@ EverGrandeCity: @ 8482598 .4byte EverGrandeCity_MapConnections .2byte MUS_RAINBOW .2byte 9 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index e239ed146..1e3591b8a 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .4byte 0x0 .2byte MUS_C_ROAD .2byte 115 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 0a4878176..0de64f823 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .4byte 0x0 .2byte MUS_C_ROAD .2byte 114 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index dbc20fd80..2c6ad7097 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .4byte 0x0 .2byte MUS_C_ROAD .2byte 113 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 4dacefc77..eba002828 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall1: @ 8483C58 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 0c160c76e..7c932e333 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall2: @ 8483C74 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index da2ef5259..ff5999475 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall3: @ 8483C90 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index da0b96380..4051a8722 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall4: @ 8483CAC .4byte 0x0 .2byte MUS_C_ROAD .2byte 315 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 0c541bd58..1f6ade600 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall5: @ 8483CC8 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 786b7c598..22bb385c3 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_HallOfFame: @ 8483D00 .4byte 0x0 .2byte MUS_EIKOU_R .2byte 298 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 2e7bef16d..267f341d5 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .4byte 0x0 .2byte MUS_C_ROAD .2byte 112 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 613b47446..1eb362f60 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 63539b7a1..3bfe680e5 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index d99e18907..e81864220 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .4byte 0x0 .2byte MUS_POKECEN .2byte 270 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 61d0b857a..59e523449 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 3855eb87a..a2f5ebef3 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .4byte 0x0 .2byte MUS_C_ROAD .2byte 111 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index c26b91f29..caece3a22 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -5,7 +5,7 @@ FallarborTown: @ 8482624 .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA .2byte 14 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index be81ffe6e..17a58396f 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -5,7 +5,7 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .4byte 0x0 .2byte MUS_B_TOWER .2byte 386 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 5f2023a71..adf2570af 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -5,7 +5,7 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 385 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index ba86df464..60d07ff5b 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -5,7 +5,7 @@ FallarborTown_BattleTentLobby: @ 8482D94 .4byte 0x0 .2byte MUS_B_TOWER .2byte 384 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index 443a4dc27..e07cc4ee8 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -5,7 +5,7 @@ FallarborTown_House1: @ 8482E20 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 59 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 17cadef2b..5e50c8271 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -5,7 +5,7 @@ FallarborTown_House2: @ 8482E3C .4byte 0x0 .2byte MUS_TONEKUSA .2byte 60 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 6e8aa3ef3..ee3d1bb7a 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -5,7 +5,7 @@ FallarborTown_Mart: @ 8482D78 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 515518d9a..ea7d76a36 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 2c67be178..a2e45e006 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 5d7879d64..1b2e2300a 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -5,7 +5,7 @@ FarawayIsland_Entrance: @ 848575C .4byte 0x0 .2byte MUS_DAN02 .2byte 402 - .byte 201 + .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index dd29fcc26..2ac52de61 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -5,7 +5,7 @@ FarawayIsland_Interior: @ 8485778 .4byte 0x0 .2byte MUS_DAN02 .2byte 403 - .byte 201 + .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte 11 .byte 8 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index c02896935..5ebac1143 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -5,7 +5,7 @@ FieryPath: @ 8484048 .4byte 0x0 .2byte MUS_DAN01 .2byte 293 - .byte 74 + .byte MAPSEC_FIERY_PATH .byte 0 .byte 0 .byte 4 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index b091e166f..98c24b211 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -5,7 +5,7 @@ FortreeCity: @ 8482528 .4byte FortreeCity_MapConnections .2byte MUS_MACHI_S3 .2byte 5 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 4ebde8a93..918a988b2 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -5,7 +5,7 @@ FortreeCity_DecorationShop: @ 848361C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 255 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index eb241b368..21b280322 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -5,7 +5,7 @@ FortreeCity_Gym: @ 848353C .4byte 0x0 .2byte MUS_GIM .2byte 100 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 06dd18e1c..9c933f5bb 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -5,7 +5,7 @@ FortreeCity_House1: @ 8483520 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 62461784f..a339e9dde 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -5,7 +5,7 @@ FortreeCity_House2: @ 84835AC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 54297f446..45f8e2e05 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -5,7 +5,7 @@ FortreeCity_House3: @ 84835C8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 71002c7da..cdd8de330 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -5,7 +5,7 @@ FortreeCity_House4: @ 84835E4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 6513cde1e..3017bae96 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -5,7 +5,7 @@ FortreeCity_House5: @ 8483600 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 18cb7b971..1dd682c08 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -5,7 +5,7 @@ FortreeCity_Mart: @ 8483590 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index ae2b8e0e8..920f961bf 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index adb7a7bde..197901ce7 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 3d29c272a..af8cc27b7 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -5,7 +5,7 @@ GraniteCave_1F: @ 8483F84 .4byte 0x0 .2byte MUS_DAN01 .2byte 132 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 6ab42f082..244eff08e 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -5,7 +5,7 @@ GraniteCave_B1F: @ 8483FA0 .4byte 0x0 .2byte MUS_DAN01 .2byte 133 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 95935c283..0d1aeea5a 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -5,7 +5,7 @@ GraniteCave_B2F: @ 8483FBC .4byte 0x0 .2byte MUS_DAN01 .2byte 134 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 0644d8cb7..2c1514b75 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -5,7 +5,7 @@ GraniteCave_StevensRoom: @ 8483FD8 .4byte 0x0 .2byte MUS_DAN01 .2byte 288 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index c77ea5934..e3a316015 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -5,7 +5,7 @@ InsideOfTruck: @ 8484EF0 .4byte 0x0 .2byte 65535 .2byte 237 - .byte 84 + .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte 0 .byte 8 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 6ff291c29..14fe2e7e2 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -5,7 +5,7 @@ IslandCave: @ 8484614 .4byte 0x0 .2byte MUS_MABOROSI .2byte 280 - .byte 81 + .byte MAPSEC_ISLAND_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index f6fc90e4e..6bab46582 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -5,7 +5,7 @@ JaggedPass: @ 848402C .4byte 0x0 .2byte MUS_DAN01 .2byte 292 - .byte 76 + .byte MAPSEC_JAGGED_PASS .byte 0 .byte 0 .byte 3 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 12cc74b5f..ff1e483e0 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -5,7 +5,7 @@ LavaridgeTown: @ 8482608 .4byte LavaridgeTown_MapConnections .2byte MUS_MACHI_S4 .2byte 13 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 30cde2e9c..e7fb510f7 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .4byte 0x0 .2byte MUS_GIM .2byte 69 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 6 .byte 8 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 66d732921..1f591e8f2 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .4byte 0x0 .2byte MUS_GIM .2byte 70 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 6 .byte 8 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index c9ef33f92..bb34945c5 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_HerbShop: @ 8482CB4 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 68 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index aa8a822f5..f9e56baea 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_House: @ 8482D08 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 64 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 72d8699f1..a01610eaf 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Mart: @ 8482D24 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index b3444dc0f..ae10ecf37 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .4byte 0x0 .2byte MUS_POKECEN .2byte 71 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 596b0e189..1fb9fc917 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 1ec7fa26e..eb3ad0011 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -5,7 +5,7 @@ LilycoveCity: @ 8482544 .4byte LilycoveCity_MapConnections .2byte MUS_MINAMO .2byte 6 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index d0b17f863..29ec0ca38 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -5,7 +5,7 @@ LilycoveCity_ContestHall: @ 84836C4 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 106 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index ddd0d6284..6cbc84c1b 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -5,7 +5,7 @@ LilycoveCity_ContestLobby: @ 84836A8 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 105 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index ed380598b..7881cf288 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .4byte 0x0 .2byte MUS_MINAMO .2byte 299 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 200e1b7bb..3e3a5810f 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .4byte 0x0 .2byte MUS_MINAMO .2byte 300 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index b5135b1ff..3e490a6cd 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .4byte 0x0 .2byte MUS_MINAMO .2byte 273 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 3a96f4c3b..991117c67 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .4byte 0x0 .2byte MUS_MINAMO .2byte 262 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 2ad060976..af11b9d99 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .4byte 0x0 .2byte MUS_MINAMO .2byte 257 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index e4ebc314a..dd79bf744 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 258 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index bb8cd73f7..48e90e355 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 259 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 9bc54b809..3a098b37c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 260 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index cf1448ab8..a1af1c59f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 261 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index abaf3ad3f..4f8b71c7a 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -5,7 +5,7 @@ LilycoveCity_Harbor: @ 8483750 .4byte 0x0 .2byte MUS_MINAMO .2byte 88 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 3d884a5d2..903bcd845 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House1: @ 8483788 .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 3d184d345..f78304998 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House2: @ 84837A4 .4byte 0x0 .2byte MUS_MINAMO .2byte 74 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 1a818490e..49bd9d333 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House3: @ 84837C0 .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 9632ffa39..331b40645 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House4: @ 84837DC .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 3721b4432..1b5c0ed32 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .4byte 0x0 .2byte MUS_BIJYUTU .2byte 103 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index c5adc0fb1..cb282a135 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .4byte 0x0 .2byte MUS_BIJYUTU .2byte 104 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 19e61cf16..3bc705498 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -5,7 +5,7 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 782efd3d0..2dd859134 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 7db9bcb62..df902a25b 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 0e23469c1..f429787fa 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .4byte 0x0 .2byte MUS_MINAMO .2byte 107 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index bf648b5da..09869a0a5 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -5,7 +5,7 @@ LilycoveCity_UnusedMart: @ 8483718 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index dcd7be859..bcb120e6b 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -5,7 +5,7 @@ LinkContestRoom1: @ 8484DA0 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 225 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 2afb7ae00..298bbad57 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -5,7 +5,7 @@ LinkContestRoom2: @ 8484E64 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 232 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 97f0cdcae..3c60ff649 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -5,7 +5,7 @@ LinkContestRoom3: @ 8484E80 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 233 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 9c0dfdc65..6be3dba3f 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -5,7 +5,7 @@ LinkContestRoom4: @ 8484E9C .4byte 0x0 .2byte MUS_CONTEST0 .2byte 234 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 42c2f3fdb..d929ef742 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -5,7 +5,7 @@ LinkContestRoom5: @ 8484EB8 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 235 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index f1487f334..cc2a56e79 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -5,7 +5,7 @@ LinkContestRoom6: @ 8484ED4 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 236 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 04010b50c..dbc6effd6 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -5,7 +5,7 @@ LittlerootTown: @ 84825B4 .4byte LittlerootTown_MapConnections .2byte MUS_MISHIRO .2byte 10 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index d5a87bae9..f4b411a06 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .4byte 0x0 .2byte MUS_MISHIRO .2byte 54 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 0153a3f27..39a81acd1 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .4byte 0x0 .2byte MUS_MISHIRO .2byte 55 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 1e72c91b5..821cacc0b 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .4byte 0x0 .2byte MUS_MISHIRO .2byte 56 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 20e9e3f5a..711c8b381 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .4byte 0x0 .2byte MUS_MISHIRO .2byte 57 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 8cd5eaf79..18b6d4d61 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .4byte 0x0 .2byte MUS_ODAMAKI .2byte 58 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 6158ed3cb..c82b22bc3 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -5,7 +5,7 @@ MagmaHideout_1F: @ 8484828 .4byte 0x0 .2byte MUS_AJITO .2byte 336 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 1a685fe55..261502089 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_2F_1R: @ 8484844 .4byte 0x0 .2byte MUS_AJITO .2byte 337 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 410522097..5032b25a6 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_2F_2R: @ 8484860 .4byte 0x0 .2byte MUS_AJITO .2byte 338 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 407408bf3..fefbbfb8d 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_2F_3R: @ 84848EC .4byte 0x0 .2byte MUS_AJITO .2byte 380 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 228b197eb..52ad4945e 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_3F_1R: @ 848487C .4byte 0x0 .2byte MUS_AJITO .2byte 339 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index d070dd32a..14d6eeff6 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_3F_2R: @ 8484898 .4byte 0x0 .2byte MUS_AJITO .2byte 340 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index 24ed48ff5..8e27ddbae 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_3F_3R: @ 84848D0 .4byte 0x0 .2byte MUS_AJITO .2byte 379 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 45b5a40e6..b32ba1b05 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -5,7 +5,7 @@ MagmaHideout_4F: @ 84848B4 .4byte 0x0 .2byte MUS_AJITO .2byte 341 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 8e3cf5a5f..41c7c1a86 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -5,7 +5,7 @@ MarineCave_End: @ 8484A04 .4byte 0x0 .2byte MUS_DAN01 .2byte 413 - .byte 203 + .byte MAPSEC_MARINE_CAVE .byte 0 .byte 6 .byte 4 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 17212c4f6..1affd1213 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -5,7 +5,7 @@ MarineCave_Entrance: @ 84849E8 .4byte 0x0 .2byte MUS_DAN01 .2byte 407 - .byte 203 + .byte MAPSEC_MARINE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index 6e83a33bd..bd14b94bf 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -5,7 +5,7 @@ MauvilleCity: @ 84824F0 .4byte MauvilleCity_MapConnections .2byte MUS_GOTOWN .2byte 3 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 8b7ecd54d..2ad55f408 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -5,7 +5,7 @@ MauvilleCity_BikeShop: @ 8483280 .4byte 0x0 .2byte MUS_GOTOWN .2byte 90 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 11a71f8c6..24dd5d97d 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -5,7 +5,7 @@ MauvilleCity_GameCorner: @ 84832B8 .4byte 0x0 .2byte MUS_CASINO .2byte 91 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index aa6430475..21aa7c991 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -5,7 +5,7 @@ MauvilleCity_Gym: @ 8483264 .4byte 0x0 .2byte MUS_GIM .2byte 89 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index db4371175..719e88b1f 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -5,7 +5,7 @@ MauvilleCity_House1: @ 848329C .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 4acd48c6d..0ab38aa38 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -5,7 +5,7 @@ MauvilleCity_House2: @ 84832D4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 3130c2d35..6e029f786 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -5,7 +5,7 @@ MauvilleCity_Mart: @ 8483328 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 5bb682b98..b2b2e21ce 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index d29063e86..aaefbba0a 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 1b1371370..6cc631f65 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_1R: @ 8483EC0 .4byte 0x0 .2byte MUS_DAN03 .2byte 125 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index a96c5648e..f225660d0 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_2R: @ 8483EDC .4byte 0x0 .2byte MUS_DAN03 .2byte 126 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 11402d3d5..ea434e50b 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_B1F_1R: @ 8483EF8 .4byte 0x0 .2byte MUS_DAN03 .2byte 127 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 81c6276d2..b820706f5 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_B1F_2R: @ 8483F14 .4byte 0x0 .2byte MUS_DAN03 .2byte 128 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 22b3aaeb6..002031a7a 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -5,7 +5,7 @@ MeteorFalls_StevensCave: @ 8484A74 .4byte 0x0 .2byte MUS_DAN03 .2byte 431 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index cd0717add..a9cf03b39 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -5,7 +5,7 @@ MirageTower_1F: @ 8484908 .4byte 0x0 .2byte MUS_TOZAN .2byte 381 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index e449c3a37..0c983da36 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -5,7 +5,7 @@ MirageTower_2F: @ 8484924 .4byte 0x0 .2byte MUS_TOZAN .2byte 382 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index def0a15c9..c26f56dea 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -5,7 +5,7 @@ MirageTower_3F: @ 8484940 .4byte 0x0 .2byte MUS_TOZAN .2byte 383 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index 7c1351ea6..fc49e37a9 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -5,7 +5,7 @@ MirageTower_4F: @ 848495C .4byte 0x0 .2byte MUS_TOZAN .2byte 388 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index fc5af866a..2c7c774d3 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -5,7 +5,7 @@ MossdeepCity: @ 8482560 .4byte MossdeepCity_MapConnections .2byte MUS_GOTOWN .2byte 7 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 9b886677e..75074e91f 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 305 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 623b5f970..14e89db1c 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .4byte 0x0 .2byte MUS_GOTOWN .2byte 306 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 321271f78..2ce3b8eaa 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -5,7 +5,7 @@ MossdeepCity_Gym: @ 84838BC .4byte 0x0 .2byte MUS_GIM .2byte 108 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 64dedcba6..8b7112431 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House1: @ 84838D8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index b3cf19738..72e0f38ab 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House2: @ 84838F4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index d54538b4e..8e56d6f53 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House3: @ 8483964 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 33acf2e51..d5f7f5db9 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House4: @ 848399C .4byte 0x0 .2byte MUS_GOTOWN .2byte 80 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 586c976e7..80bc3bc38 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -5,7 +5,7 @@ MossdeepCity_Mart: @ 8483948 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 5ee83f3ce..2277dd173 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index a6659fafb..59c6ea2c8 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index abfb64ee8..ea035f4be 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 275 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 3a7fce680..e1418859b 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 276 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 83a907bda..070effff6 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -5,7 +5,7 @@ MossdeepCity_StevensHouse: @ 8483980 .4byte 0x0 .2byte MUS_GOTOWN .2byte 327 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index bbdfaeb44..8d060e401 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -5,7 +5,7 @@ MtChimney: @ 8484010 .4byte 0x0 .2byte MUS_TOZAN .2byte 136 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 .byte 7 .byte 3 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index efd224564..7c1e49a99 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation: @ 8483DFC .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 118 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 17b7673c7..9e903d5b6 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -5,7 +5,7 @@ MtPyre_1F: @ 8484064 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 137 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index d4a35c4c6..4f3687bf2 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -5,7 +5,7 @@ MtPyre_2F: @ 8484080 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 138 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 8bf9f015a..28721a757 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -5,7 +5,7 @@ MtPyre_3F: @ 848409C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 139 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 9360976d4..a0be9d599 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -5,7 +5,7 @@ MtPyre_4F: @ 84840B8 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 140 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 193120ca8..7e756e8f5 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -5,7 +5,7 @@ MtPyre_5F: @ 84840D4 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 141 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 3c390f962..b9c9f38c5 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -5,7 +5,7 @@ MtPyre_6F: @ 84840F0 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 142 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 013d84e84..aba767d32 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -5,7 +5,7 @@ MtPyre_Exterior: @ 848410C .4byte 0x0 .2byte MUS_MACHUPI .2byte 302 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 55f9d512b..10b8c44de 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -5,7 +5,7 @@ MtPyre_Summit: @ 8484128 .4byte 0x0 .2byte MUS_MACHUPI .2byte 303 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 6 .byte 3 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 9a9b308de..1d982d11f 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -5,7 +5,7 @@ NavelRock_B1F: @ 84858C8 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 427 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index 84d942a9e..ccd6e4de4 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -5,7 +5,7 @@ NavelRock_Bottom: @ 8485AC0 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 424 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 4f8237761..2d6f6cdc1 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -5,7 +5,7 @@ NavelRock_Down01: @ 848598C .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 027de3f91..6146db29c 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -5,7 +5,7 @@ NavelRock_Down02: @ 84859A8 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 41ae68722..0a0601117 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -5,7 +5,7 @@ NavelRock_Down03: @ 84859C4 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index a45886c16..f1014f5e8 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -5,7 +5,7 @@ NavelRock_Down04: @ 84859E0 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 2ab0c76ba..e638b9306 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -5,7 +5,7 @@ NavelRock_Down05: @ 84859FC .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index d8a17e85f..db7bbbb92 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -5,7 +5,7 @@ NavelRock_Down06: @ 8485A18 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index 0a77e6406..27c228fe8 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -5,7 +5,7 @@ NavelRock_Down07: @ 8485A34 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index a3cbed38a..5cf41ad24 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -5,7 +5,7 @@ NavelRock_Down08: @ 8485A50 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 6aed92500..b82c99552 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -5,7 +5,7 @@ NavelRock_Down09: @ 8485A6C .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index bb96b7e3d..2b1826572 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -5,7 +5,7 @@ NavelRock_Down10: @ 8485A88 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index 48ed319eb..19fc50327 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -5,7 +5,7 @@ NavelRock_Down11: @ 8485AA4 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index cc8d2446b..2a302f904 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -5,7 +5,7 @@ NavelRock_Entrance: @ 84858AC .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 422 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index a01250cab..4122b51cc 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -5,7 +5,7 @@ NavelRock_Exterior: @ 8485874 .4byte 0x0 .2byte MUS_RG_NANASHIMA .2byte 421 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index a6dab9d20..d6da1a2c9 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -5,7 +5,7 @@ NavelRock_Fork: @ 84858E4 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 428 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index c7243f452..f74ca0cdd 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -5,7 +5,7 @@ NavelRock_Harbor: @ 8485890 .4byte 0x0 .2byte MUS_RG_NANASHIMA .2byte 405 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 4d1535615..464e1d3ec 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -5,7 +5,7 @@ NavelRock_Top: @ 8485970 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 423 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 11 .byte 4 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index c7484c59f..ebc18196d 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -5,7 +5,7 @@ NavelRock_Up1: @ 8485900 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index 824ef267d..d259d7af2 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -5,7 +5,7 @@ NavelRock_Up2: @ 848591C .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index 7782ca0f4..12cc5aed7 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -5,7 +5,7 @@ NavelRock_Up3: @ 8485938 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index c022d9d0b..6455c8555 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -5,7 +5,7 @@ NavelRock_Up4: @ 8485954 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 147f003d0..212457f72 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -5,7 +5,7 @@ NewMauville_Entrance: @ 8484470 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 184 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 3eda8df5e..637ac378e 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -5,7 +5,7 @@ NewMauville_Inside: @ 848448C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 185 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 3d8ae1db5..16fb5aca0 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -5,7 +5,7 @@ OldaleTown: @ 84825D0 .4byte OldaleTown_MapConnections .2byte MUS_MACHI_S4 .2byte 11 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 6039540cc..f593d5769 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -5,7 +5,7 @@ OldaleTown_House1: @ 8482B80 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 59 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 75753041f..f7a265561 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -5,7 +5,7 @@ OldaleTown_House2: @ 8482B9C .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 60 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 043acab8d..09fb145c8 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -5,7 +5,7 @@ OldaleTown_Mart: @ 8482BF0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index d51331b61..dd942886a 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 9b9df67fd..21e6fc1f9 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 3244c01b8..3e4d88784 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -5,7 +5,7 @@ PacifidlogTown: @ 848265C .4byte PacifidlogTown_MapConnections .2byte MUS_MINAMO .2byte 16 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index b78d36a2a..95d820a95 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House1: @ 8482F8C .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 571dcd9ce..79c591b4a 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House2: @ 8482FA8 .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index fb60530a6..5222263f1 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House3: @ 8482FC4 .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 7beed0a39..3774ccf3e 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House4: @ 8482FE0 .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 671c7d28e..b8789b249 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5: @ 8482FFC .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index d11ea93d2..6fdc148e3 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 00724203f..dc78b95ac 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 248c6d2ae..fab1f946c 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -5,7 +5,7 @@ PetalburgCity: @ 84824B8 .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 .2byte 1 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 739f19b74..6d3a477be 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -5,7 +5,7 @@ PetalburgCity_Gym: @ 8483034 .4byte 0x0 .2byte MUS_GIM .2byte 79 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 6aeb5deef..7f9655153 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -5,7 +5,7 @@ PetalburgCity_House1: @ 8483050 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 59 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 9595c1372..8471a0f01 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -5,7 +5,7 @@ PetalburgCity_House2: @ 848306C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 80 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 7742f8bfe..d7b062ba2 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -5,7 +5,7 @@ PetalburgCity_Mart: @ 84830C0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index af57b7bab..6dc976d05 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 1528ab624..46f83636f 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 4e207706d..b6a064a8e 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -5,7 +5,7 @@ PetalburgCity_WallysHouse: @ 8483018 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 60 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 096f4a704..b7f1ad818 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -5,7 +5,7 @@ PetalburgWoods: @ 8483FF4 .4byte 0x0 .2byte MUS_DAN01 .2byte 135 - .byte 59 + .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte 11 .byte 3 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 7235504fa..aa3a7dd19 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -5,7 +5,7 @@ RecordCorner: @ 8484D68 .4byte 0x0 .2byte MUS_RAINBOW .2byte 223 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index ef027d1c6..34a1ef764 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -5,7 +5,7 @@ Route101: @ 8482678 .4byte Route101_MapConnections .2byte MUS_DOORO1 .2byte 17 - .byte 16 + .byte MAPSEC_ROUTE_101 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 22da93b7a..8a3b38d62 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -5,7 +5,7 @@ Route102: @ 8482694 .4byte Route102_MapConnections .2byte MUS_DOORO1 .2byte 18 - .byte 17 + .byte MAPSEC_ROUTE_102 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 1a8825bc1..e59af7c13 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -5,7 +5,7 @@ Route103: @ 84826B0 .4byte Route103_MapConnections .2byte MUS_DOORO1 .2byte 19 - .byte 18 + .byte MAPSEC_ROUTE_103 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index f431118c1..4d600499c 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -5,7 +5,7 @@ Route104: @ 84826CC .4byte Route104_MapConnections .2byte MUS_NEXTROAD .2byte 20 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index c6335b13f..14b8c1801 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -5,7 +5,7 @@ Route104_MrBrineysHouse: @ 8483D70 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 102 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index e23012fb4..b95129158 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -5,7 +5,7 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 117 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 50f1b7b08..6c60ccfbe 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -5,7 +5,7 @@ Route104_Prototype: @ 8485AF8 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 287 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 61217a576..24cc091e9 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -5,7 +5,7 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 117 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index f7538b723..3b34c3e70 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -5,7 +5,7 @@ Route105: @ 84826E8 .4byte Route105_MapConnections .2byte MUS_NEXTROAD .2byte 21 - .byte 20 + .byte MAPSEC_ROUTE_105 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 93f4bd835..51dfac9e3 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -5,7 +5,7 @@ Route106: @ 8482704 .4byte Route106_MapConnections .2byte MUS_NEXTROAD .2byte 22 - .byte 21 + .byte MAPSEC_ROUTE_106 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index a27885664..2c61323b5 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -5,7 +5,7 @@ Route107: @ 8482720 .4byte Route107_MapConnections .2byte MUS_NEXTROAD .2byte 23 - .byte 22 + .byte MAPSEC_ROUTE_107 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 2c4cea90d..eb982f2de 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -5,7 +5,7 @@ Route108: @ 848273C .4byte Route108_MapConnections .2byte MUS_NEXTROAD .2byte 24 - .byte 23 + .byte MAPSEC_ROUTE_108 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index c9482cf31..b4e577678 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -5,7 +5,7 @@ Route109: @ 8482758 .4byte Route109_MapConnections .2byte MUS_NEXTROAD .2byte 25 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index cec1ace27..68ae187ba 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -5,7 +5,7 @@ Route109_SeashoreHouse: @ 8485B30 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 243 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index d6d394209..55bd7dbd0 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -5,7 +5,7 @@ Route110: @ 8482774 .4byte Route110_MapConnections .2byte MUS_DOORO_X1 .2byte 26 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 35a466e1e..a271dba58 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -5,7 +5,7 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .4byte 0x0 .2byte MUS_FINECITY .2byte 256 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 2529d7366..811184bd9 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -5,7 +5,7 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .4byte 0x0 .2byte MUS_FINECITY .2byte 256 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 99a4a694a..07a795f3a 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseCorridor: @ 8485B84 .4byte 0x0 .2byte MUS_KARAKURI .2byte 246 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 0b38de121..0ed34b2d1 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEnd: @ 8485B68 .4byte 0x0 .2byte MUS_KARAKURI .2byte 245 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 842b2f32d..5a90430fd 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEntrance: @ 8485B4C .4byte 0x0 .2byte MUS_KARAKURI .2byte 244 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index ef5388364..c5620a2ce 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .4byte 0x0 .2byte MUS_KARAKURI .2byte 247 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index d54eb7752..202a75774 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle2: @ 8485BBC .4byte 0x0 .2byte MUS_KARAKURI .2byte 248 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 3bcf40de1..2ad32f43f 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .4byte 0x0 .2byte MUS_KARAKURI .2byte 249 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 85df95a1a..40b394a27 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .4byte 0x0 .2byte MUS_KARAKURI .2byte 250 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 2402f4cc5..9bb6f40b9 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle5: @ 8485C10 .4byte 0x0 .2byte MUS_KARAKURI .2byte 251 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 946ad91f4..fa3bc610a 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle6: @ 8485C2C .4byte 0x0 .2byte MUS_KARAKURI .2byte 252 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 5de9d6400..8a9f6e6cd 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle7: @ 8485C48 .4byte 0x0 .2byte MUS_KARAKURI .2byte 253 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 750270dea..8023f4478 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle8: @ 8485C64 .4byte 0x0 .2byte MUS_KARAKURI .2byte 254 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 89feae870..a65a8c849 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -5,7 +5,7 @@ Route111: @ 8482790 .4byte Route111_MapConnections .2byte MUS_DOORO_X1 .2byte 27 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index c2c055af6..2f827017f 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -5,7 +5,7 @@ Route111_OldLadysRestStop: @ 8483DC4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 64 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 4cf6ca023..909277b85 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -5,7 +5,7 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 397c0060a..24589a71e 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -5,7 +5,7 @@ Route112: @ 84827AC .4byte Route112_MapConnections .2byte MUS_DOORO_X1 .2byte 28 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 72667053d..dff57293e 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -5,7 +5,7 @@ Route112_CableCarStation: @ 8483DE0 .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 118 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 87d56215e..3ed0f5455 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -5,7 +5,7 @@ Route113: @ 84827C8 .4byte Route113_MapConnections .2byte MUS_KAZANBAI .2byte 29 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index e9424580a..5298c41c2 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop: @ 8485CB8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 67 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index cda0036b3..d717c1235 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -5,7 +5,7 @@ Route114: @ 84827E4 .4byte Route114_MapConnections .2byte MUS_DOORO_X1 .2byte 30 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index efe6a1b76..01ac3e4dd 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -5,7 +5,7 @@ Route114_FossilManiacsHouse: @ 8483E18 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 119 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index c20e1b2d3..b3794190b 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -5,7 +5,7 @@ Route114_FossilManiacsTunnel: @ 8483E34 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 120 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 9a5763394..031ae74b6 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -5,7 +5,7 @@ Route114_LanettesHouse: @ 8483E50 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 121 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 97156442e..56cbab012 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -5,7 +5,7 @@ Route115: @ 8482800 .4byte Route115_MapConnections .2byte MUS_NEXTROAD .2byte 31 - .byte 30 + .byte MAPSEC_ROUTE_115 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 919dffa6f..8fef8f257 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -5,7 +5,7 @@ Route116: @ 848281C .4byte Route116_MapConnections .2byte MUS_NEXTROAD .2byte 32 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index ac319327f..8dad76407 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -5,7 +5,7 @@ Route116_TunnelersRestHouse: @ 8483E6C .4byte 0x0 .2byte MUS_GOTOWN .2byte 122 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 897d37afb..02804667c 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -5,7 +5,7 @@ Route117: @ 8482838 .4byte Route117_MapConnections .2byte MUS_DOORO_X1 .2byte 33 - .byte 32 + .byte MAPSEC_ROUTE_117 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index f690fa432..ea69af862 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -5,7 +5,7 @@ Route117_PokemonDayCare: @ 8483E88 .4byte 0x0 .2byte MUS_GOTOWN .2byte 123 - .byte 32 + .byte MAPSEC_ROUTE_117 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 3bf779b27..ad90e8f55 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -5,7 +5,7 @@ Route118: @ 8482854 .4byte Route118_MapConnections .2byte MUS_ROUTE_118 .2byte 34 - .byte 33 + .byte MAPSEC_ROUTE_118 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index cb61c3a38..af32f0bde 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -5,7 +5,7 @@ Route119: @ 8482870 .4byte Route119_MapConnections .2byte MUS_GRANROAD .2byte 35 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 754b0c245..8f966eaf4 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -5,7 +5,7 @@ Route119_House: @ 8485D28 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index fac499e3f..7d324311e 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 271 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 69a351082..d2a09b1b7 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_2F: @ 8485D0C .4byte 0x0 .2byte MUS_GOTOWN .2byte 272 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 9b8d641d9..1fa502a2b 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -5,7 +5,7 @@ Route120: @ 848288C .4byte Route120_MapConnections .2byte MUS_DOORO_X3 .2byte 36 - .byte 35 + .byte MAPSEC_ROUTE_120 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 4a05c76fe..588540fd4 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -5,7 +5,7 @@ Route121: @ 84828A8 .4byte Route121_MapConnections .2byte MUS_DOORO_X3 .2byte 37 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 56a07a3fa..9bb2b86fc 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -5,7 +5,7 @@ Route121_SafariZoneEntrance: @ 8483EA4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 124 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 591501de1..d5bbaccf4 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -5,7 +5,7 @@ Route122: @ 84828C4 .4byte Route122_MapConnections .2byte MUS_DOORO_X4 .2byte 38 - .byte 37 + .byte MAPSEC_ROUTE_122 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 7d7a4590f..e3fa357dd 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -5,7 +5,7 @@ Route123: @ 84828E0 .4byte Route123_MapConnections .2byte MUS_DOORO_X4 .2byte 39 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index f1466f9e7..89b03ed88 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -5,7 +5,7 @@ Route123_BerryMastersHouse: @ 8485CD4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 811fb3ec7..2ad541e81 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -5,7 +5,7 @@ Route124: @ 84828FC .4byte Route124_MapConnections .2byte MUS_DOORO_X3 .2byte 40 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index a7501cddc..d68c93985 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -5,7 +5,7 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .4byte 0x0 .2byte MUS_MINAMO .2byte 301 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 4e67b3cb6..30691d270 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -5,7 +5,7 @@ Route125: @ 8482918 .4byte Route125_MapConnections .2byte MUS_DOORO_X3 .2byte 41 - .byte 40 + .byte MAPSEC_ROUTE_125 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 13e741159..c00086a0b 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -5,7 +5,7 @@ Route126: @ 8482934 .4byte Route126_MapConnections .2byte MUS_DOORO_X3 .2byte 42 - .byte 41 + .byte MAPSEC_ROUTE_126 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index fa3ee0200..c242fe898 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -5,7 +5,7 @@ Route127: @ 8482950 .4byte Route127_MapConnections .2byte MUS_DOORO_X3 .2byte 43 - .byte 42 + .byte MAPSEC_ROUTE_127 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 08acd71f2..6ced2f320 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -5,7 +5,7 @@ Route128: @ 848296C .4byte Route128_MapConnections .2byte MUS_DOORO_X3 .2byte 44 - .byte 43 + .byte MAPSEC_ROUTE_128 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 53abdbebe..4128e5dec 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -5,7 +5,7 @@ Route129: @ 8482988 .4byte Route129_MapConnections .2byte MUS_GRANROAD .2byte 45 - .byte 44 + .byte MAPSEC_ROUTE_129 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 47b4b613c..105e4316c 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -5,7 +5,7 @@ Route130: @ 84829A4 .4byte Route130_MapConnections .2byte MUS_GRANROAD .2byte 263 - .byte 45 + .byte MAPSEC_ROUTE_130 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index b13a344fc..0151fefde 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -5,7 +5,7 @@ Route131: @ 84829C0 .4byte Route131_MapConnections .2byte MUS_GRANROAD .2byte 47 - .byte 46 + .byte MAPSEC_ROUTE_131 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index b4fe2bc0d..77392dae8 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -5,7 +5,7 @@ Route132: @ 84829DC .4byte Route132_MapConnections .2byte MUS_GRANROAD .2byte 48 - .byte 47 + .byte MAPSEC_ROUTE_132 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index e8bc66e6f..0233c4b1b 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -5,7 +5,7 @@ Route133: @ 84829F8 .4byte Route133_MapConnections .2byte MUS_GRANROAD .2byte 49 - .byte 48 + .byte MAPSEC_ROUTE_133 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 20f6dd90a..b4bc18251 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -5,7 +5,7 @@ Route134: @ 8482A14 .4byte Route134_MapConnections .2byte MUS_GRANROAD .2byte 50 - .byte 49 + .byte MAPSEC_ROUTE_134 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index adce7ef75..f26674d87 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -5,7 +5,7 @@ RustboroCity: @ 848250C .4byte RustboroCity_MapConnections .2byte MUS_GOTOWN .2byte 4 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 5423772bf..b1e738b79 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -5,7 +5,7 @@ RustboroCity_CuttersHouse: @ 8483478 .4byte 0x0 .2byte MUS_GOTOWN .2byte 98 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 9e270b9fc..56dc26994 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_1F: @ 8483344 .4byte 0x0 .2byte MUS_GOTOWN .2byte 92 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index f3954aed0..65046644f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_2F: @ 8483360 .4byte 0x0 .2byte MUS_GOTOWN .2byte 93 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index c0bbdebd1..7a5968b18 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F: @ 848337C .4byte 0x0 .2byte MUS_GOTOWN .2byte 269 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 4f424b853..e9754f54f 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat1_1F: @ 8483424 .4byte 0x0 .2byte MUS_GOTOWN .2byte 313 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 49e5c1481..a07f7fba9 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat1_2F: @ 8483440 .4byte 0x0 .2byte MUS_GOTOWN .2byte 314 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 4080980a0..66e8b9e0e 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_1F: @ 84834B0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 294 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index d4ad99dbc..8a7884e58 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_2F: @ 84834CC .4byte 0x0 .2byte MUS_GOTOWN .2byte 295 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 90918421f..70e622e46 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_3F: @ 84834E8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 296 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 8aef6fe28..f5297aaa2 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -5,7 +5,7 @@ RustboroCity_Gym: @ 8483398 .4byte 0x0 .2byte MUS_GIM .2byte 94 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index c921d3a5e..e668e6327 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -5,7 +5,7 @@ RustboroCity_House1: @ 848345C .4byte 0x0 .2byte MUS_GOTOWN .2byte 97 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 6f4d6c02d..bd075650e 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -5,7 +5,7 @@ RustboroCity_House2: @ 8483494 .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 73b5d4a0b..f03668a60 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -5,7 +5,7 @@ RustboroCity_House3: @ 8483504 .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index cb82a6500..58a9f6075 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -5,7 +5,7 @@ RustboroCity_Mart: @ 8483408 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 3db96f00d..f482ba044 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 74f264702..48e731a3e 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 3d68afc48..6948dc366 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonSchool: @ 84833B4 .4byte 0x0 .2byte MUS_P_SCHOOL .2byte 95 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index d4f1fdad5..998208e80 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -5,7 +5,7 @@ RusturfTunnel: @ 8483F30 .4byte 0x0 .2byte MUS_DAN01 .2byte 129 - .byte 60 + .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte 6 .byte 4 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 046eedc85..a33e236dd 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -5,7 +5,7 @@ SSTidalCorridor: @ 8484F0C .4byte 0x0 .2byte MUS_M_BOAT .2byte 277 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 3e2f5bacb..2c627ad0b 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -5,7 +5,7 @@ SSTidalLowerDeck: @ 8484F28 .4byte 0x0 .2byte MUS_M_BOAT .2byte 278 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index c5f0aaa00..935427cae 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -5,7 +5,7 @@ SSTidalRooms: @ 8484F44 .4byte 0x0 .2byte MUS_M_BOAT .2byte 279 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index d7ad06ffa..5452be556 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -5,7 +5,7 @@ SafariZone_North: @ 8485158 .4byte SafariZone_North_MapConnections .2byte MUS_SAFARI .2byte 239 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 58685eafe..9e8be1352 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -5,7 +5,7 @@ SafariZone_Northeast: @ 848528C .4byte SafariZone_Northeast_MapConnections .2byte MUS_SAFARI .2byte 394 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 81718dc65..b3c98ee11 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -5,7 +5,7 @@ SafariZone_Northwest: @ 848513C .4byte SafariZone_Northwest_MapConnections .2byte MUS_SAFARI .2byte 238 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 92488b12d..b56865835 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -5,7 +5,7 @@ SafariZone_RestHouse: @ 8485270 .4byte 0x0 .2byte MUS_SAFARI .2byte 329 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 3ffd068c2..9780b80d9 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -5,7 +5,7 @@ SafariZone_South: @ 8485190 .4byte SafariZone_South_MapConnections .2byte MUS_SAFARI .2byte 241 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 438d3ea7f..17d73acf8 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -5,7 +5,7 @@ SafariZone_Southeast: @ 84852A8 .4byte SafariZone_Southeast_MapConnections .2byte MUS_SAFARI .2byte 395 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 5cff316ae..5c82a2c3a 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -5,7 +5,7 @@ SafariZone_Southwest: @ 8485174 .4byte SafariZone_Southwest_MapConnections .2byte MUS_SAFARI .2byte 240 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 543f83ebb..23aab68fe 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -5,7 +5,7 @@ ScorchedSlab: @ 84846BC .4byte 0x0 .2byte MUS_DAN01 .2byte 311 - .byte 80 + .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 3e26232dc..32e0cbb75 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Entrance: @ 84841B4 .4byte 0x0 .2byte MUS_TOZAN .2byte 147 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 29a75081f..4dd67bdb3 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room1: @ 84841D0 .4byte 0x0 .2byte MUS_TOZAN .2byte 148 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 749b4b9ee..bec8fc16a 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room2: @ 84841EC .4byte 0x0 .2byte MUS_TOZAN .2byte 149 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 4ef0565be..3e6b0f5c8 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room3: @ 8484208 .4byte 0x0 .2byte MUS_TOZAN .2byte 150 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 0edd39d4a..a45bb4f6a 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room4: @ 8484224 .4byte 0x0 .2byte MUS_TOZAN .2byte 151 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 013f447dc..831c85394 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room5: @ 8484240 .4byte 0x0 .2byte MUS_TOZAN .2byte 152 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 9bbb14463..5e39909fc 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room6: @ 848425C .4byte 0x0 .2byte MUS_TOZAN .2byte 153 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index d4b0db267..fa9e72804 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room7: @ 8484278 .4byte 0x0 .2byte MUS_TOZAN .2byte 154 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 903e25a14..8248b89f7 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room8: @ 8484294 .4byte 0x0 .2byte MUS_TOZAN .2byte 155 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 0d43deb23..2fb1a3b70 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room9: @ 84842B0 .4byte 0x0 .2byte MUS_TOZAN .2byte 156 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 6 .byte 4 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 4a26587bc..5e2b0c363 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -5,7 +5,7 @@ SealedChamber_InnerRoom: @ 84846A0 .4byte 0x0 .2byte MUS_MABOROSI .2byte 304 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index fd5fe39f3..1fabd6be1 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -5,7 +5,7 @@ SealedChamber_OuterRoom: @ 8484684 .4byte 0x0 .2byte MUS_MABOROSI .2byte 284 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 4e987702c..4783af7a7 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave1: @ 8484AC8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 199 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index ed22bbb04..208a27ae8 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave2: @ 8484B70 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 205 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 412d1f4af..0bdfe5f0f 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave3: @ 8484C18 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 211 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 542df3954..490214803 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave4: @ 8484CC0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 217 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index aceddbfda..ad8dc034c 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave1: @ 8484AAC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 198 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index de95374ba..2e10374ec 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave2: @ 8484B54 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 204 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 8535b1e89..213364166 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave3: @ 8484BFC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 210 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index d73f38257..2dc17b4e0 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave4: @ 8484CA4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 216 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 1cb6c4f5e..70dcb91af 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave1: @ 8484A90 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 197 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 744e8b24e..23f96fb4e 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave2: @ 8484B38 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 203 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index c153e74c6..68e302a71 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave3: @ 8484BE0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 209 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index be475a7ad..faf3fd44b 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave4: @ 8484C88 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 215 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 6ab9f9d94..2a98c0dd7 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub1: @ 8484B1C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 202 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 760781e47..b3ccb0446 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub2: @ 8484BC4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 208 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index cef2a4597..7e408128e 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub3: @ 8484C6C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 214 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 12fa26c3c..ea2c263bb 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub4: @ 8484D14 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 220 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index c5b5a2aed..e3951f3c1 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree1: @ 8484B00 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 201 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index ddea5c0bc..23e8da9b9 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree2: @ 8484BA8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 207 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 630dbb6e3..61378b8a3 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree3: @ 8484C50 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 213 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index bc6f84664..b5f601189 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree4: @ 8484CF8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 219 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 9a6ae5438..1eee3cfed 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave1: @ 8484AE4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 200 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index da1949abe..27d5a0ecc 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave2: @ 8484B8C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 206 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 8bfeff0f5..f2e986b1c 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave3: @ 8484C34 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 212 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index baf6b7d89..292672976 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave4: @ 8484CDC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 218 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 2f3f34b43..3c02b2433 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 168 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 673bc6bec..b58e12335 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 169 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index c742d2b8c..c34c87a10 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 164 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 6571068ce..69aa8114e 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 328 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index b6de02c7d..9fea56a0f 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 165 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 719a92c3e..3dc8cae94 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideLowerRoom: @ 848441C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 167 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 74d0ec94f..5123f9a80 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 166 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index 54d003c27..9100eb6de 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -5,7 +5,7 @@ SingleBattleColosseum: @ 8484D30 .4byte 0x0 .2byte MUS_RAINBOW .2byte 221 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 3a47df473..7f55c68fb 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -5,7 +5,7 @@ SkyPillar_1F: @ 8484764 .4byte 0x0 .2byte MUS_TOZAN .2byte 322 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index a1cc8fb8f..2be149c00 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -5,7 +5,7 @@ SkyPillar_2F: @ 8484780 .4byte 0x0 .2byte MUS_TOZAN .2byte 323 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 81ac3046d..e54ede745 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -5,7 +5,7 @@ SkyPillar_3F: @ 848479C .4byte 0x0 .2byte MUS_TOZAN .2byte 324 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 10a68ddc2..9823646f4 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -5,7 +5,7 @@ SkyPillar_4F: @ 84847B8 .4byte 0x0 .2byte MUS_TOZAN .2byte 325 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index bb38a2d5d..f72124743 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -5,7 +5,7 @@ SkyPillar_5F: @ 84847F0 .4byte 0x0 .2byte MUS_TOZAN .2byte 330 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 8031521e9..8efd8c542 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -5,7 +5,7 @@ SkyPillar_Entrance: @ 848472C .4byte 0x0 .2byte MUS_TOZAN .2byte 320 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 38bb57bae..24a7a4e2b 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -5,7 +5,7 @@ SkyPillar_Outside: @ 8484748 .4byte 0x0 .2byte MUS_TOZAN .2byte 321 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 3836ab067..1f99a1cb8 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -5,7 +5,7 @@ SkyPillar_Top: @ 848480C .4byte 0x0 .2byte MUS_TOZAN .2byte 331 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 7ac123723..e617b0a91 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -5,7 +5,7 @@ SlateportCity: @ 84824D4 .4byte SlateportCity_MapConnections .2byte MUS_FINECITY .2byte 2 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index 4c8c94753..c76e6230b 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -5,7 +5,7 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .4byte 0x0 .2byte MUS_B_TOWER .2byte 386 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 7ea7cca9e..ddc1bfcef 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -5,7 +5,7 @@ SlateportCity_BattleTentCorridor: @ 8483130 .4byte 0x0 .2byte MUS_B_TOWER .2byte 385 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 1a809a567..767410cbb 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -5,7 +5,7 @@ SlateportCity_BattleTentLobby: @ 8483114 .4byte 0x0 .2byte MUS_B_TOWER .2byte 384 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 7f214b54c..8ec8c294b 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor: @ 84831D8 .4byte 0x0 .2byte MUS_FINECITY .2byte 88 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 4f7bc3f98..8f221fcc7 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -5,7 +5,7 @@ SlateportCity_House1: @ 8483168 .4byte 0x0 .2byte MUS_FINECITY .2byte 80 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 12389ed44..bc4fc03ce 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -5,7 +5,7 @@ SlateportCity_House2: @ 84831F4 .4byte 0x0 .2byte MUS_FINECITY .2byte 60 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index e13692bba..569969de3 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -5,7 +5,7 @@ SlateportCity_Mart: @ 8483248 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 4b0224075..88c4e349b 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 86 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 7d4272d09..e300ced6a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 87 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 8d1e8cc17..2b3d99694 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 7bf64b603..6070cab3c 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonCenter_2F: @ 848322C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 87a6c0c5b..34a3f1916 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonFanClub: @ 8483184 .4byte 0x0 .2byte MUS_FINECITY .2byte 85 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index c04b411f1..d4b8e9aea 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .4byte 0x0 .2byte MUS_FINECITY .2byte 81 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index e3b36f4ed..894aabb9a 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .4byte 0x0 .2byte MUS_FINECITY .2byte 82 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 74469da7c..0b48dbca0 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -5,7 +5,7 @@ SootopolisCity: @ 848257C .4byte 0x0 .2byte MUS_RUNECITY .2byte 8 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 4200a7ed8..663a64800 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Gym_1F: @ 8483A28 .4byte 0x0 .2byte MUS_GIM .2byte 109 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 6265830e9..11bb3b502 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Gym_B1F: @ 8483A44 .4byte 0x0 .2byte MUS_GIM .2byte 110 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 2551aedc1..5eaa8d470 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House1: @ 8483AB4 .4byte 0x0 .2byte MUS_RUNECITY .2byte 307 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 24e7a778a..36daf5bb2 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House2: @ 8483AD0 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 97ae23fb7..dfe26c5ea 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House3: @ 8483AEC .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index d39499132..1275ccf91 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House4: @ 8483B08 .4byte 0x0 .2byte MUS_RUNECITY .2byte 307 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index d6de286cf..0d634d549 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House5: @ 8483B24 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 36460f147..9f151e737 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House6: @ 8483B40 .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 383ab24b5..7dac9a029 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House7: @ 8483B5C .4byte 0x0 .2byte MUS_RUNECITY .2byte 307 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 792b5ae31..d0fa71556 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -5,7 +5,7 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .4byte 0x0 .2byte MUS_RUNECITY .2byte 297 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index ac4ae5ea0..f1fc07ae2 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Mart: @ 8483A98 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 2e5ea1f84..7828f6bbb 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .4byte 0x0 .2byte MUS_RUNECITY .2byte 439 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index c3ffec414..5ebbff88b 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .4byte 0x0 .2byte MUS_RUNECITY .2byte 440 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 83485cbf1..537ab1709 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index ba2bb5c0d..76493dcfa 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index d0d35fea1..82948348b 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -5,7 +5,7 @@ SouthernIsland_Exterior: @ 8485238 .4byte 0x0 .2byte MUS_DAN02 .2byte 290 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 1a080af1e..be575d25b 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -5,7 +5,7 @@ SouthernIsland_Interior: @ 8485254 .4byte 0x0 .2byte MUS_DAN02 .2byte 291 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte 11 .byte 3 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 900f5930f..94a871f6a 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -5,7 +5,7 @@ TerraCave_End: @ 8484A3C .4byte 0x0 .2byte MUS_DAN01 .2byte 409 - .byte 205 + .byte MAPSEC_TERRA_CAVE .byte 0 .byte 6 .byte 4 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index 02c5edb91..81c405cdf 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -5,7 +5,7 @@ TerraCave_Entrance: @ 8484A20 .4byte 0x0 .2byte MUS_DAN01 .2byte 408 - .byte 205 + .byte MAPSEC_TERRA_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 55afa79f3..92d6c14a7 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -5,7 +5,7 @@ TradeCenter: @ 8484D4C .4byte 0x0 .2byte MUS_RAINBOW .2byte 222 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index e5fd3b576..fba54fabd 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -5,7 +5,7 @@ TrainerHill_1F: @ 84857E8 .4byte 0x0 .2byte MUS_B_TOWER .2byte 415 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index 712c99cec..d47e960ed 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -5,7 +5,7 @@ TrainerHill_2F: @ 8485804 .4byte 0x0 .2byte MUS_B_TOWER .2byte 416 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index 92bbd40a1..60f981e3d 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -5,7 +5,7 @@ TrainerHill_3F: @ 8485820 .4byte 0x0 .2byte MUS_B_TOWER .2byte 417 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 5de769778..6b7edf22b 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -5,7 +5,7 @@ TrainerHill_4F: @ 848583C .4byte 0x0 .2byte MUS_B_TOWER .2byte 418 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 13912579d..dd5daa4e2 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -5,7 +5,7 @@ TrainerHill_Elevator: @ 8485ADC .4byte 0x0 .2byte MUS_B_TOWER .2byte 266 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index f37950d98..60422a940 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -5,7 +5,7 @@ TrainerHill_Entrance: @ 84857CC .4byte 0x0 .2byte MUS_B_TOWER .2byte 414 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index 3527f447f..c6c3e626c 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -5,7 +5,7 @@ TrainerHill_Roof: @ 8485858 .4byte 0x0 .2byte MUS_B_TOWER .2byte 419 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index d63ca8815..6d3603bf5 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -5,7 +5,7 @@ Underwater1: @ 8482A30 .4byte Underwater1_MapConnections .2byte MUS_DEEPDEEP .2byte 274 - .byte 50 + .byte MAPSEC_UNDERWATER_124 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index a2754c69e..03230042b 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -5,7 +5,7 @@ Underwater2: @ 8482A4C .4byte Underwater2_MapConnections .2byte MUS_DEEPDEEP .2byte 51 - .byte 51 + .byte MAPSEC_UNDERWATER_125 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 8329304a8..203cf8b3c 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -5,7 +5,7 @@ Underwater3: @ 8482A68 .4byte Underwater3_MapConnections .2byte MUS_DEEPDEEP .2byte 52 - .byte 52 + .byte MAPSEC_UNDERWATER_126 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index f4f3e8c4b..b5de8aa07 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -5,7 +5,7 @@ Underwater4: @ 8482A84 .4byte Underwater4_MapConnections .2byte MUS_DEEPDEEP .2byte 53 - .byte 53 + .byte MAPSEC_UNDERWATER_127 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index 043a6997e..e6a846303 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -5,7 +5,7 @@ Underwater5: @ 8482AA0 .4byte Underwater5_MapConnections .2byte MUS_DEEPDEEP .2byte 412 - .byte 208 + .byte MAPSEC_UNDERWATER_129 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 1be09d6a1..0aadca37d 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -5,7 +5,7 @@ Underwater6: @ 8482ABC .4byte Underwater6_MapConnections .2byte MUS_DEEPDEEP .2byte 410 - .byte 206 + .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 4ededa296..388c3510f 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -5,7 +5,7 @@ Underwater7: @ 8482AD8 .4byte Underwater7_MapConnections .2byte MUS_DEEPDEEP .2byte 411 - .byte 207 + .byte MAPSEC_UNDERWATER_UNK1 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 54bffb710..4aca9a734 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -5,7 +5,7 @@ Underwater_MarineCave: @ 84849CC .4byte 0x0 .2byte MUS_DAN01 .2byte 406 - .byte 204 + .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index f08f506a1..5715c5e90 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -5,7 +5,7 @@ Underwater_Route134: @ 848464C .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 282 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 6415ac787..b39773d23 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern: @ 8484198 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 146 - .byte 69 + .byte MAPSEC_UNDERWATER_128 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index a72666d12..8ca54e9fb 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -5,7 +5,7 @@ Underwater_SealedChamber: @ 8484668 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 283 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index ef9ee1612..661c4d105 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -5,7 +5,7 @@ Underwater_SootopolisCity: @ 8483F4C .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 130 - .byte 54 + .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte 14 .byte 5 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index b79ae81a2..55566ceef 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -5,7 +5,7 @@ UnionRoom: @ 8485120 .4byte 0x0 .2byte MUS_RAINBOW .2byte 393 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 4c8edd31c..79438a8d4 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_29: @ 8484DBC .4byte 0x0 .2byte MUS_NIBI .2byte 226 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 46465019e..f5a6fde39 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_30: @ 8484DD8 .4byte 0x0 .2byte MUS_NIBI .2byte 227 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 13e428cfd..cf5318be0 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_31: @ 8484DF4 .4byte 0x0 .2byte MUS_NIBI .2byte 228 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 8244c3802..538798a4c 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_32: @ 8484E10 .4byte 0x0 .2byte MUS_NIBI .2byte 229 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index b4da8dd48..c4d384729 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_33: @ 8484E2C .4byte 0x0 .2byte MUS_NIBI .2byte 230 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index bb1ce881c..3d08bf4ba 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_34: @ 8484E48 .4byte 0x0 .2byte MUS_NIBI .2byte 231 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 047ba12ad..aa176dbfd 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -5,7 +5,7 @@ VerdanturfTown: @ 8482640 .4byte VerdanturfTown_MapConnections .2byte MUS_GOMACHI0 .2byte 15 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 1eef21301..bcdd211ee 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .4byte 0x0 .2byte MUS_B_TOWER .2byte 387 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 9b8f62260..e704df2f0 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .4byte 0x0 .2byte MUS_B_TOWER .2byte 385 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 4d1e0ca9e..7c7bc244c 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .4byte 0x0 .2byte MUS_B_TOWER .2byte 384 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 51f3dadbd..a83a7f2fe 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 60 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index e6571b7f0..ebc8d2083 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_House: @ 8482F38 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 59 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 6f69b3aac..90b1e7e0a 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_Mart: @ 8482EAC .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index b6c5177ce..5a8e1183f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index ee657d77b..0de25d4fa 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index cb727234e..7f9a923ec 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_WandasHouse: @ 8482F00 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 76 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 35ff7bd3b..7e13504a5 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_1F: @ 8484374 .4byte 0x0 .2byte MUS_C_ROAD .2byte 163 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 0 .byte 0 .byte 4 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index b9edeeb17..107eb524f 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_B1F: @ 8484390 .4byte 0x0 .2byte MUS_C_ROAD .2byte 285 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 .byte 0 .byte 4 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index b6c80a656..3c9453154 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_B2F: @ 84843AC .4byte 0x0 .2byte MUS_C_ROAD .2byte 286 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 .byte 0 .byte 4 -- cgit v1.2.3 From d53e8137cd1e14c7fd5435562a979bb6bd83d20e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:15:35 -0500 Subject: Use weather constants in map headers --- data/maps.s | 1 + data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap1/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap2/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidTop/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerElevator/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- data/maps/BattleFrontier_OutsideEast/header.inc | 2 +- data/maps/BattleFrontier_OutsideWest/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_1F/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_2F/header.inc | 2 +- data/maps/BattleFrontier_RankingHall/header.inc | 2 +- data/maps/BattleFrontier_ReceptionGate/header.inc | 2 +- data/maps/BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_2F/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/FallarborTown_BattleTentCorridor/header.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreElevator/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_3F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_4F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- data/maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- data/maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- data/maps/Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- data/maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_BattleTentBattleRoom/header.inc | 2 +- data/maps/SlateportCity_BattleTentCorridor/header.inc | 2 +- data/maps/SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_1F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentCorridor/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentLobby/header.inc | 2 +- data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- 519 files changed, 519 insertions(+), 518 deletions(-) diff --git a/data/maps.s b/data/maps.s index 8a0c2d43a..59a6b4930 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,6 +1,7 @@ #include "constants/maps.h" #include "constants/region_map_sections.h" #include "constants/songs.h" +#include "constants/weather.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index a07a66947..149f27655 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .2byte 195 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 118d91860..a0971779c 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Corridors_1F: @ 84844C4 .2byte 187 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 6b743af3a..12cb7e697 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC .2byte 189 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index da8f1f124..f6616f885 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Deck: @ 84844A8 .2byte 186 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index e83f9a020..f375e0bee 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .2byte 289 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index b6b48d652..0ef17861a 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -7,7 +7,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .2byte 310 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 7 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 3282054cb..5dc438acd 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Room_B1F: @ 848456C .2byte 193 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 4d5eead34..e4bf89911 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms2_1F: @ 8484588 .2byte 194 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index ddac73f8e..fa713bf29 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .2byte 191 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 304180955..d552a8cac 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms_1F: @ 84844E0 .2byte 188 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index b9be9d667..7b121a2d2 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms_B1F: @ 8484518 .2byte 190 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index e73f1c5d9..0176f1637 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Underwater1: @ 8484550 .2byte 192 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index cb7f00a6f..7ca32edb8 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -7,7 +7,7 @@ AbandonedShip_Underwater2: @ 84845C0 .2byte 196 .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 1c390ec99..344bdaf8c 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -7,7 +7,7 @@ AlteringCave: @ 8484A58 .2byte 420 .byte MAPSEC_ALTERING_CAVE_2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 5cce523f9..afc0f475c 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -7,7 +7,7 @@ AncientTomb: @ 8484630 .2byte 281 .byte MAPSEC_ANCIENT_TOMB .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 31085dd4c..7590ebce5 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -7,7 +7,7 @@ AquaHideout_1F: @ 8484144 .2byte 143 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 984d16740..51ec82492 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -7,7 +7,7 @@ AquaHideout_B1F: @ 8484160 .2byte 144 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 230c2b7d0..0d903e1cf 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -7,7 +7,7 @@ AquaHideout_B2F: @ 848417C .2byte 145 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index c2dc76096..242f32e61 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -7,7 +7,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .2byte 316 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index cc01983a9..ebc999cf4 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -7,7 +7,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .2byte 317 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index 8adc7f2ba..f9d571c8e 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -7,7 +7,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .2byte 318 .byte MAPSEC_AQUA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index 33d974804..b801c08af 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -7,7 +7,7 @@ ArtisanCave_1F: @ 84849B0 .2byte 401 .byte MAPSEC_ARTISAN_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index 8ff225a8e..8e106ea1c 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -7,7 +7,7 @@ ArtisanCave_B1F: @ 8484994 .2byte 400 .byte MAPSEC_ARTISAN_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 927137cf0..d20c65c2e 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .2byte 356 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index 332363738..ba4431464 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .2byte 355 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 541613f53..112fb86bd 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C .2byte 354 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 6ddf3fb45..19d194169 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .2byte 335 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 25c5d684f..72caf9523 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .2byte 333 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index be93189ab..0d607e671 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .2byte 332 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index 592300353..db09e9b41 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .2byte 334 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index c672d86cd..27e2c8952 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .2byte 348 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 1fa0645a3..b9fb23a03 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .2byte 346 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index 766e9689b..e1fa2d524 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .2byte 347 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 696e41601..701647467 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .2byte 344 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index 18ddced68..d867a0daf 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .2byte 343 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index cc723eb42..3b53c9397 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .2byte 342 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index 955b0be42..0f93684c3 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .2byte 350 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index e75761bed..d6fe6e340 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .2byte 349 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index e5ea8a3ef..f4fde68ad 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .2byte 352 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 8111043c6..4274d8eee 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .2byte 353 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 2395feb52..15b65af63 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .2byte 358 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index f6b0e6351..b744f348f 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .2byte 351 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index fca127f5f..289c02455 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .2byte 398 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index a5eda44ef..a0face861 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .2byte 361 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 06fd632f8..9fa6b7fa3 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .2byte 360 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 140a5d4e8..970aadfbe 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .2byte 378 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index fdf167b9f..18d60521c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .2byte 268 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 157a9f0ae..6606a9be7 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .2byte 268 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index de71a7dc6..13b0ebbf3 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .2byte 267 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 1ba6d43c9..1a6e40299 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .2byte 391 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index d3e6216d2..380a5400e 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .2byte 266 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index db62f0be3..5d9252fbb 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .2byte 264 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 5a25ffafa..9bcd28c75 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -7,7 +7,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .2byte 390 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 21e01eb7d..25e88a5df 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge1: @ 84855B8 .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index ad875cc4e..71b933474 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge2: @ 84855F0 .2byte 397 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 8ce5169d7..2f4b74d7e 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge3: @ 848560C .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index 11f40472b..6fea64a15 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge4: @ 8485628 .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index 743ccd512..f38db8f29 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge5: @ 8485660 .2byte 397 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index b6192f8a9..78f103166 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge6: @ 848567C .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 96843d502..871e16cc2 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge7: @ 8485698 .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 9a320a4bf..620e79304 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge8: @ 84856D0 .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 999ba6ce0..37b608edf 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge9: @ 84856EC .2byte 429 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 2285a9e3f..b356e7d7a 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -7,7 +7,7 @@ BattleFrontier_Mart: @ 8485740 .2byte 63 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index 0f49f1e4b..3db684e8f 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -7,7 +7,7 @@ BattleFrontier_OutsideEast: @ 84852C4 .2byte 345 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index bbef1d1c7..2c1d3754e 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -7,7 +7,7 @@ BattleFrontier_OutsideWest: @ 84851AC .2byte 265 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 2b39d2cf6..283c3744a 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .2byte 61 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 740141748..44442a28c 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .2byte 62 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 8036032e3..2e91cbfaf 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -7,7 +7,7 @@ BattleFrontier_RankingHall: @ 848559C .2byte 396 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 236698cd2..f009f93e5 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -7,7 +7,7 @@ BattleFrontier_ReceptionGate: @ 84856B4 .2byte 399 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index b7468a9d2..11cf24022 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -7,7 +7,7 @@ BattleFrontier_ScottsHouse: @ 8485644 .2byte 430 .byte MAPSEC_BATTLE_FRONTIER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index dc3deeb48..ef8c315d9 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare01: @ 8484F60 .2byte 362 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 8d65a6fa6..41f1523cf 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare02: @ 8484F7C .2byte 363 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index c3bf3376d..2938d5280 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare03: @ 8484F98 .2byte 364 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index c001abc53..ae838f26d 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare04: @ 8484FB4 .2byte 365 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index e96d7cac7..e893cfbcb 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare05: @ 8484FD0 .2byte 366 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 440eac549..397c7c27c 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare06: @ 8484FEC .2byte 367 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index f467dfd7d..3d9e1c2c5 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare07: @ 8485008 .2byte 368 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index 00c45e577..af3df7eba 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare08: @ 8485024 .2byte 369 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 27a33d4b0..2fb732618 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare09: @ 8485040 .2byte 370 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 1507f0518..8f95706d3 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare10: @ 848505C .2byte 371 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 98c08a116..8d0ffdaae 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare11: @ 8485078 .2byte 372 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index 39cc4061a..268f24cb1 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare12: @ 8485094 .2byte 373 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index b4b1a281d..b4d09580f 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare13: @ 84850B0 .2byte 374 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 407cf0024..7d43feff0 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare14: @ 84850CC .2byte 375 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 37d8c75cb..c67e86abe 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare15: @ 84850E8 .2byte 376 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index f264ace73..3026d44bd 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -7,7 +7,7 @@ BattlePyramidSquare16: @ 8485104 .2byte 377 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 04a62dd6b..5bda31250 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -7,7 +7,7 @@ BirthIsland_Exterior: @ 8485794 .2byte 404 .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 12 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index e3b8a21f3..f0ea9a70a 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -7,7 +7,7 @@ BirthIsland_Harbor: @ 84857B0 .2byte 405 .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index c25c0d82b..2b4464937 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_1F: @ 84842E8 .2byte 158 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index b5eacd7d9..46cac3433 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_B1F: @ 8484358 .2byte 162 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 5cda3da60..a19256b39 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_Entrance: @ 84842CC .2byte 157 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 762fb4115..155670bf0 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .2byte 159 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index bd77221f6..12d34ac46 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .2byte 160 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index a5597e4e9..9edfd72a8 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -7,7 +7,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .2byte 161 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 009a279e1..7e63a9023 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -7,7 +7,7 @@ DesertRuins: @ 8483F68 .2byte 131 .byte MAPSEC_DESERT_RUINS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 9d4bec918..d3f41bd72 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -7,7 +7,7 @@ DesertUnderpass: @ 8484978 .2byte 389 .byte MAPSEC_DESERT_UNDERPASS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index c6fb45581..fb1270636 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -7,7 +7,7 @@ DewfordTown: @ 84825EC .2byte 12 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 24866ee7a..de821f116 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -7,7 +7,7 @@ DewfordTown_Gym: @ 8482C60 .2byte 65 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index dfa5daf1f..934a5a039 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -7,7 +7,7 @@ DewfordTown_Hall: @ 8482C7C .2byte 66 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 94c735b59..46352ccc6 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -7,7 +7,7 @@ DewfordTown_House1: @ 8482C0C .2byte 64 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index c27122bc5..0d7070cae 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -7,7 +7,7 @@ DewfordTown_House2: @ 8482C98 .2byte 67 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index e7b628503..8a22a27f8 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .2byte 61 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 90ec683d7..cd54f5fe0 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .2byte 62 .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 05949ab05..8d4de2924 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -7,7 +7,7 @@ DoubleBattleColosseum: @ 8484D84 .2byte 224 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 7ba0b694b..7401e4f2f 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -7,7 +7,7 @@ EverGrandeCity: @ 8482598 .2byte 9 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 1e3591b8a..3cbf3d3b7 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .2byte 115 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 0de64f823..87ee3f9b6 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .2byte 114 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 2c6ad7097..b8170952e 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .2byte 113 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index eba002828..2b993b9a6 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall1: @ 8483C58 .2byte 116 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 7c932e333..9d7a836fe 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall2: @ 8483C74 .2byte 116 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index ff5999475..d22707542 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall3: @ 8483C90 .2byte 116 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 4051a8722..80867002f 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall4: @ 8483CAC .2byte 315 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 1f6ade600..1d1ac9edd 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_Hall5: @ 8483CC8 .2byte 116 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 22bb385c3..6918cc2f1 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_HallOfFame: @ 8483D00 .2byte 298 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 267f341d5..b852e1c8e 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .2byte 112 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 1eb362f60..d43b97fbc 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .2byte 61 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 3bfe680e5..3ee23fe99 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .2byte 62 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index e81864220..17d01bfae 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .2byte 270 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 59e523449..217647a56 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .2byte 62 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index a2f5ebef3..875c190f5 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .2byte 111 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index caece3a22..77be7ebaa 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -7,7 +7,7 @@ FallarborTown: @ 8482624 .2byte 14 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 17a58396f..0781e0c30 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -7,7 +7,7 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .2byte 386 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index adf2570af..6e5950e85 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -7,7 +7,7 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .2byte 385 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 60d07ff5b..6702e2f9d 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -7,7 +7,7 @@ FallarborTown_BattleTentLobby: @ 8482D94 .2byte 384 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index e07cc4ee8..b801201f3 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -7,7 +7,7 @@ FallarborTown_House1: @ 8482E20 .2byte 59 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 5e50c8271..b30fdf515 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -7,7 +7,7 @@ FallarborTown_House2: @ 8482E3C .2byte 60 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index ee3d1bb7a..7c9be5b8f 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -7,7 +7,7 @@ FallarborTown_Mart: @ 8482D78 .2byte 63 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index ea7d76a36..0e1402710 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .2byte 61 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index a2e45e006..f00757c91 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .2byte 62 .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 1b2e2300a..539a797f1 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -7,7 +7,7 @@ FarawayIsland_Entrance: @ 848575C .2byte 402 .byte MAPSEC_FARAWAY_ISLAND .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 13 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index 2ac52de61..a5b52d076 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -7,7 +7,7 @@ FarawayIsland_Interior: @ 8485778 .2byte 403 .byte MAPSEC_FARAWAY_ISLAND .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 8 .2byte 0 .byte 13 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 5ebac1143..bdf2ec584 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -7,7 +7,7 @@ FieryPath: @ 8484048 .2byte 293 .byte MAPSEC_FIERY_PATH .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 98c24b211..7e20bffff 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -7,7 +7,7 @@ FortreeCity: @ 8482528 .2byte 5 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 918a988b2..dadd55e02 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -7,7 +7,7 @@ FortreeCity_DecorationShop: @ 848361C .2byte 255 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 21b280322..459db5bd5 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -7,7 +7,7 @@ FortreeCity_Gym: @ 848353C .2byte 100 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 9c933f5bb..013caf4d2 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -7,7 +7,7 @@ FortreeCity_House1: @ 8483520 .2byte 99 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index a339e9dde..b631de024 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -7,7 +7,7 @@ FortreeCity_House2: @ 84835AC .2byte 101 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 45f8e2e05..477706e68 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -7,7 +7,7 @@ FortreeCity_House3: @ 84835C8 .2byte 99 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index cdd8de330..15182d88f 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -7,7 +7,7 @@ FortreeCity_House4: @ 84835E4 .2byte 101 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 3017bae96..29dbe8c13 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -7,7 +7,7 @@ FortreeCity_House5: @ 8483600 .2byte 99 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 1dd682c08..0a67a7b51 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -7,7 +7,7 @@ FortreeCity_Mart: @ 8483590 .2byte 63 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 920f961bf..02819535e 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .2byte 61 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 197901ce7..ab03878eb 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .2byte 62 .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index af8cc27b7..df957dc4d 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -7,7 +7,7 @@ GraniteCave_1F: @ 8483F84 .2byte 132 .byte MAPSEC_GRANITE_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 244eff08e..183cece4a 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -7,7 +7,7 @@ GraniteCave_B1F: @ 8483FA0 .2byte 133 .byte MAPSEC_GRANITE_CAVE .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 0d1aeea5a..452fd1e2f 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -7,7 +7,7 @@ GraniteCave_B2F: @ 8483FBC .2byte 134 .byte MAPSEC_GRANITE_CAVE .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 2c1514b75..159d49277 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -7,7 +7,7 @@ GraniteCave_StevensRoom: @ 8483FD8 .2byte 288 .byte MAPSEC_GRANITE_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index e3a316015..438f3bd0a 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -7,7 +7,7 @@ InsideOfTruck: @ 8484EF0 .2byte 237 .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 14fe2e7e2..6d097c21d 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -7,7 +7,7 @@ IslandCave: @ 8484614 .2byte 280 .byte MAPSEC_ISLAND_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 6bab46582..326269407 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -7,7 +7,7 @@ JaggedPass: @ 848402C .2byte 292 .byte MAPSEC_JAGGED_PASS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index ff1e483e0..9ddad2758 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -7,7 +7,7 @@ LavaridgeTown: @ 8482608 .2byte 13 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index e7fb510f7..1257c09c0 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .2byte 69 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 1f591e8f2..fc90b501f 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .2byte 70 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index bb34945c5..db621e67d 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_HerbShop: @ 8482CB4 .2byte 68 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index f9e56baea..b8f607e15 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_House: @ 8482D08 .2byte 64 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index a01610eaf..f06a48f72 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_Mart: @ 8482D24 .2byte 63 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index ae10ecf37..42a463624 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .2byte 71 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 1fb9fc917..7149858a8 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .2byte 62 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index eb3ad0011..f372e381c 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -7,7 +7,7 @@ LilycoveCity: @ 8482544 .2byte 6 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 29ec0ca38..1cd935b55 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -7,7 +7,7 @@ LilycoveCity_ContestHall: @ 84836C4 .2byte 106 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 6cbc84c1b..ee9660ebf 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -7,7 +7,7 @@ LilycoveCity_ContestLobby: @ 84836A8 .2byte 105 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 7881cf288..166d86828 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .2byte 299 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 3e3a5810f..9b8f05106 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .2byte 300 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 3e490a6cd..23e99c981 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .2byte 273 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 991117c67..ffd3d4021 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .2byte 262 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index af11b9d99..695b5560d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .2byte 257 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index dd79bf744..34beb40f7 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .2byte 258 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 48e90e355..5c49de2eb 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .2byte 259 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 3a098b37c..c298bc024 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .2byte 260 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index a1af1c59f..32c178628 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .2byte 261 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 4f8b71c7a..a28edee35 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -7,7 +7,7 @@ LilycoveCity_Harbor: @ 8483750 .2byte 88 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 903bcd845..e29bdfbc5 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House1: @ 8483788 .2byte 59 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index f78304998..0ffeffd03 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House2: @ 84837A4 .2byte 74 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 49bd9d333..fc2868a9c 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House3: @ 84837C0 .2byte 60 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 331b40645..66c3636cf 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -7,7 +7,7 @@ LilycoveCity_House4: @ 84837DC .2byte 59 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 1b5c0ed32..292c61623 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .2byte 103 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index cb282a135..9bdff8e90 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .2byte 104 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 3bc705498..1adc065dd 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -7,7 +7,7 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .2byte 60 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 2dd859134..92bc0e9d9 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .2byte 61 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index df902a25b..1ae72be25 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .2byte 62 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index f429787fa..2137aecc9 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .2byte 107 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 09869a0a5..ecff7b16f 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -7,7 +7,7 @@ LilycoveCity_UnusedMart: @ 8483718 .2byte 63 .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index bcb120e6b..8b35b2629 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -7,7 +7,7 @@ LinkContestRoom1: @ 8484DA0 .2byte 225 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 298bbad57..b8e3e1822 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -7,7 +7,7 @@ LinkContestRoom2: @ 8484E64 .2byte 232 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 3c60ff649..5b1e2d8f3 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -7,7 +7,7 @@ LinkContestRoom3: @ 8484E80 .2byte 233 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 6be3dba3f..6a4190ca7 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -7,7 +7,7 @@ LinkContestRoom4: @ 8484E9C .2byte 234 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index d929ef742..bf95bb2ef 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -7,7 +7,7 @@ LinkContestRoom5: @ 8484EB8 .2byte 235 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index cc2a56e79..231f31001 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -7,7 +7,7 @@ LinkContestRoom6: @ 8484ED4 .2byte 236 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index dbc6effd6..5fb0a6eab 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -7,7 +7,7 @@ LittlerootTown: @ 84825B4 .2byte 10 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index f4b411a06..69eff71f7 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .2byte 54 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 39a81acd1..7b5fa7375 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .2byte 55 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 821cacc0b..56b925c2a 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .2byte 56 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 711c8b381..496d3cf83 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .2byte 57 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 18b6d4d61..7ba2b7e0e 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -7,7 +7,7 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .2byte 58 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index c82b22bc3..65e781626 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -7,7 +7,7 @@ MagmaHideout_1F: @ 8484828 .2byte 336 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 261502089..50bf554d7 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_2F_1R: @ 8484844 .2byte 337 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 5032b25a6..376c2f232 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_2F_2R: @ 8484860 .2byte 338 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index fefbbfb8d..bc8816d1c 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_2F_3R: @ 84848EC .2byte 380 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 52ad4945e..412756e49 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_3F_1R: @ 848487C .2byte 339 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index 14d6eeff6..d0ae8c4e1 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_3F_2R: @ 8484898 .2byte 340 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index 8e27ddbae..f27df336c 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -7,7 +7,7 @@ MagmaHideout_3F_3R: @ 84848D0 .2byte 379 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index b32ba1b05..778899830 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -7,7 +7,7 @@ MagmaHideout_4F: @ 84848B4 .2byte 341 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 41c7c1a86..da43bbc46 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -7,7 +7,7 @@ MarineCave_End: @ 8484A04 .2byte 413 .byte MAPSEC_MARINE_CAVE .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 1affd1213..6432ee987 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -7,7 +7,7 @@ MarineCave_Entrance: @ 84849E8 .2byte 407 .byte MAPSEC_MARINE_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index bd14b94bf..a6a3db192 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -7,7 +7,7 @@ MauvilleCity: @ 84824F0 .2byte 3 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 2ad55f408..942859e0c 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -7,7 +7,7 @@ MauvilleCity_BikeShop: @ 8483280 .2byte 90 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 24dd5d97d..20e6b5a09 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -7,7 +7,7 @@ MauvilleCity_GameCorner: @ 84832B8 .2byte 91 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index 21aa7c991..e10fa76c8 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -7,7 +7,7 @@ MauvilleCity_Gym: @ 8483264 .2byte 89 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 719e88b1f..b5f6b9175 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -7,7 +7,7 @@ MauvilleCity_House1: @ 848329C .2byte 60 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 0ab38aa38..fe7b14fcc 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -7,7 +7,7 @@ MauvilleCity_House2: @ 84832D4 .2byte 59 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 6e029f786..082ff6045 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -7,7 +7,7 @@ MauvilleCity_Mart: @ 8483328 .2byte 63 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index b2b2e21ce..ddc901f44 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .2byte 61 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index aaefbba0a..e4981b277 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .2byte 62 .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 6cc631f65..2b012f5b8 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_1F_1R: @ 8483EC0 .2byte 125 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index f225660d0..e2b352406 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_1F_2R: @ 8483EDC .2byte 126 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index ea434e50b..a90a21049 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_B1F_1R: @ 8483EF8 .2byte 127 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index b820706f5..df6a9ee01 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -7,7 +7,7 @@ MeteorFalls_B1F_2R: @ 8483F14 .2byte 128 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 002031a7a..cf9796360 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -7,7 +7,7 @@ MeteorFalls_StevensCave: @ 8484A74 .2byte 431 .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index a9cf03b39..90bc41a90 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -7,7 +7,7 @@ MirageTower_1F: @ 8484908 .2byte 381 .byte MAPSEC_MIRAGE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index 0c983da36..4a984edea 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -7,7 +7,7 @@ MirageTower_2F: @ 8484924 .2byte 382 .byte MAPSEC_MIRAGE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index c26f56dea..c3c126d56 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -7,7 +7,7 @@ MirageTower_3F: @ 8484940 .2byte 383 .byte MAPSEC_MIRAGE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index fc49e37a9..c0b51c174 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -7,7 +7,7 @@ MirageTower_4F: @ 848495C .2byte 388 .byte MAPSEC_MIRAGE_TOWER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 2c7c774d3..eba304363 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -7,7 +7,7 @@ MossdeepCity: @ 8482560 .2byte 7 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 75074e91f..b04ffb872 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .2byte 305 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 14e89db1c..d0b115b37 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .2byte 306 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 2ce3b8eaa..df190975c 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -7,7 +7,7 @@ MossdeepCity_Gym: @ 84838BC .2byte 108 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 8b7112431..0843eb3f4 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House1: @ 84838D8 .2byte 60 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 72e0f38ab..b844bd961 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House2: @ 84838F4 .2byte 59 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 8e56d6f53..6e47ed443 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House3: @ 8483964 .2byte 60 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index d5f7f5db9..dbd201c2e 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -7,7 +7,7 @@ MossdeepCity_House4: @ 848399C .2byte 80 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 80bc3bc38..72dc8a409 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -7,7 +7,7 @@ MossdeepCity_Mart: @ 8483948 .2byte 63 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 2277dd173..e39eb8183 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .2byte 61 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 59c6ea2c8..022761465 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .2byte 62 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index ea035f4be..c38fc57eb 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .2byte 275 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index e1418859b..53fb8a06a 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -7,7 +7,7 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .2byte 276 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 070effff6..43b5f92cf 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -7,7 +7,7 @@ MossdeepCity_StevensHouse: @ 8483980 .2byte 327 .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 8d060e401..29c068992 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -7,7 +7,7 @@ MtChimney: @ 8484010 .2byte 136 .byte MAPSEC_MT_CHIMNEY .byte 0 - .byte 7 + .byte WEATHER_ASH .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 7c1e49a99..3de6d823e 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -7,7 +7,7 @@ MtChimney_CableCarStation: @ 8483DFC .2byte 118 .byte MAPSEC_MT_CHIMNEY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 9e903d5b6..88306a7de 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -7,7 +7,7 @@ MtPyre_1F: @ 8484064 .2byte 137 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 4f3687bf2..0afddfb49 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -7,7 +7,7 @@ MtPyre_2F: @ 8484080 .2byte 138 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 28721a757..8ccabb8c8 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -7,7 +7,7 @@ MtPyre_3F: @ 848409C .2byte 139 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index a0be9d599..22a41d25c 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -7,7 +7,7 @@ MtPyre_4F: @ 84840B8 .2byte 140 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 7e756e8f5..47f92d2c8 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -7,7 +7,7 @@ MtPyre_5F: @ 84840D4 .2byte 141 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index b9c9f38c5..ceaceca41 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -7,7 +7,7 @@ MtPyre_6F: @ 84840F0 .2byte 142 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index aba767d32..c5e7576cf 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -7,7 +7,7 @@ MtPyre_Exterior: @ 848410C .2byte 302 .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 10b8c44de..29597bceb 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -7,7 +7,7 @@ MtPyre_Summit: @ 8484128 .2byte 303 .byte MAPSEC_MT_PYRE .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 1d982d11f..2f8d472d2 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -7,7 +7,7 @@ NavelRock_B1F: @ 84858C8 .2byte 427 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index ccd6e4de4..ee2eeb102 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -7,7 +7,7 @@ NavelRock_Bottom: @ 8485AC0 .2byte 424 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 2d6f6cdc1..8b11f8d93 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -7,7 +7,7 @@ NavelRock_Down01: @ 848598C .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 6146db29c..0b56cba11 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -7,7 +7,7 @@ NavelRock_Down02: @ 84859A8 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 0a0601117..a674e3849 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -7,7 +7,7 @@ NavelRock_Down03: @ 84859C4 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index f1014f5e8..34359e5b8 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -7,7 +7,7 @@ NavelRock_Down04: @ 84859E0 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index e638b9306..2be325bad 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -7,7 +7,7 @@ NavelRock_Down05: @ 84859FC .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index db7bbbb92..c38950b20 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -7,7 +7,7 @@ NavelRock_Down06: @ 8485A18 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index 27c228fe8..65af6ccd8 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -7,7 +7,7 @@ NavelRock_Down07: @ 8485A34 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index 5cf41ad24..fd08b39ea 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -7,7 +7,7 @@ NavelRock_Down08: @ 8485A50 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index b82c99552..9b22ca051 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -7,7 +7,7 @@ NavelRock_Down09: @ 8485A6C .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index 2b1826572..4301b5f93 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -7,7 +7,7 @@ NavelRock_Down10: @ 8485A88 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index 19fc50327..a45e05795 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -7,7 +7,7 @@ NavelRock_Down11: @ 8485AA4 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index 2a302f904..5509d0cde 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -7,7 +7,7 @@ NavelRock_Entrance: @ 84858AC .2byte 422 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index 4122b51cc..ed9234f34 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -7,7 +7,7 @@ NavelRock_Exterior: @ 8485874 .2byte 421 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 13 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index d6da1a2c9..73aab8ad6 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -7,7 +7,7 @@ NavelRock_Fork: @ 84858E4 .2byte 428 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index f74ca0cdd..9e60e032f 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -7,7 +7,7 @@ NavelRock_Harbor: @ 8485890 .2byte 405 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 464e1d3ec..3a1c8254d 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -7,7 +7,7 @@ NavelRock_Top: @ 8485970 .2byte 423 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index ebc18196d..41a342eb3 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -7,7 +7,7 @@ NavelRock_Up1: @ 8485900 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index d259d7af2..db13a9adf 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -7,7 +7,7 @@ NavelRock_Up2: @ 848591C .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index 12cc5aed7..e6e140696 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -7,7 +7,7 @@ NavelRock_Up3: @ 8485938 .2byte 425 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 6455c8555..be297090a 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -7,7 +7,7 @@ NavelRock_Up4: @ 8485954 .2byte 426 .byte MAPSEC_NAVEL_ROCK2 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 12 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 212457f72..08df71885 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -7,7 +7,7 @@ NewMauville_Entrance: @ 8484470 .2byte 184 .byte MAPSEC_NEW_MAUVILLE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 637ac378e..87628d4cf 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -7,7 +7,7 @@ NewMauville_Inside: @ 848448C .2byte 185 .byte MAPSEC_NEW_MAUVILLE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 16fb5aca0..de8566823 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -7,7 +7,7 @@ OldaleTown: @ 84825D0 .2byte 11 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index f593d5769..0accc508b 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -7,7 +7,7 @@ OldaleTown_House1: @ 8482B80 .2byte 59 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index f7a265561..2d6cffcfa 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -7,7 +7,7 @@ OldaleTown_House2: @ 8482B9C .2byte 60 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 09fb145c8..d2bc44d39 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -7,7 +7,7 @@ OldaleTown_Mart: @ 8482BF0 .2byte 63 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index dd942886a..2a0988475 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .2byte 61 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 21e6fc1f9..b1399a1b0 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .2byte 62 .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 3e4d88784..f903637a3 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -7,7 +7,7 @@ PacifidlogTown: @ 848265C .2byte 16 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 95d820a95..90098ec2c 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House1: @ 8482F8C .2byte 77 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 79c591b4a..a1433fbbc 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House2: @ 8482FA8 .2byte 78 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 5222263f1..28d0fd8a5 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House3: @ 8482FC4 .2byte 77 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 3774ccf3e..adbd42c6a 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House4: @ 8482FE0 .2byte 78 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index b8789b249..b30fb80d3 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_House5: @ 8482FFC .2byte 77 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 6fdc148e3..6d95c3b6e 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .2byte 61 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index dc78b95ac..9cc1d0470 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .2byte 62 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index fab1f946c..bd94ab120 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -7,7 +7,7 @@ PetalburgCity: @ 84824B8 .2byte 1 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 6d3a477be..661552e20 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -7,7 +7,7 @@ PetalburgCity_Gym: @ 8483034 .2byte 79 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 7f9655153..00e26fe1a 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -7,7 +7,7 @@ PetalburgCity_House1: @ 8483050 .2byte 59 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 8471a0f01..1a643f7e2 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -7,7 +7,7 @@ PetalburgCity_House2: @ 848306C .2byte 80 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index d7b062ba2..85d8331a1 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -7,7 +7,7 @@ PetalburgCity_Mart: @ 84830C0 .2byte 63 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 6dc976d05..336958088 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .2byte 61 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 46f83636f..7b1e01861 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .2byte 62 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index b6a064a8e..68c746b58 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -7,7 +7,7 @@ PetalburgCity_WallysHouse: @ 8483018 .2byte 60 .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index b7f1ad818..bda2a3ab5 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -7,7 +7,7 @@ PetalburgWoods: @ 8483FF4 .2byte 135 .byte MAPSEC_PETALBURG_WOODS .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index aa3a7dd19..4d4583acf 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -7,7 +7,7 @@ RecordCorner: @ 8484D68 .2byte 223 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 34a1ef764..0c76acfbc 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -7,7 +7,7 @@ Route101: @ 8482678 .2byte 17 .byte MAPSEC_ROUTE_101 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 8a3b38d62..33e22d3bd 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -7,7 +7,7 @@ Route102: @ 8482694 .2byte 18 .byte MAPSEC_ROUTE_102 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index e59af7c13..22f0976d3 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -7,7 +7,7 @@ Route103: @ 84826B0 .2byte 19 .byte MAPSEC_ROUTE_103 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 4d600499c..02019604d 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -7,7 +7,7 @@ Route104: @ 84826CC .2byte 20 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 14b8c1801..e67afc46c 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -7,7 +7,7 @@ Route104_MrBrineysHouse: @ 8483D70 .2byte 102 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index b95129158..caf3f3f86 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -7,7 +7,7 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .2byte 117 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 6c60ccfbe..ca694df00 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -7,7 +7,7 @@ Route104_Prototype: @ 8485AF8 .2byte 287 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 8 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 24cc091e9..87a794524 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -7,7 +7,7 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .2byte 117 .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 8 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 3b34c3e70..a55cb3ede 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -7,7 +7,7 @@ Route105: @ 84826E8 .2byte 21 .byte MAPSEC_ROUTE_105 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 51dfac9e3..df51d4222 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -7,7 +7,7 @@ Route106: @ 8482704 .2byte 22 .byte MAPSEC_ROUTE_106 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 2c61323b5..09a47a2ae 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -7,7 +7,7 @@ Route107: @ 8482720 .2byte 23 .byte MAPSEC_ROUTE_107 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index eb982f2de..3b55160d8 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -7,7 +7,7 @@ Route108: @ 848273C .2byte 24 .byte MAPSEC_ROUTE_108 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index b4e577678..30f3501a5 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -7,7 +7,7 @@ Route109: @ 8482758 .2byte 25 .byte MAPSEC_ROUTE_109 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 68ae187ba..c9cbe2d23 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -7,7 +7,7 @@ Route109_SeashoreHouse: @ 8485B30 .2byte 243 .byte MAPSEC_ROUTE_109 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 55bd7dbd0..92157a59d 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -7,7 +7,7 @@ Route110: @ 8482774 .2byte 26 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index a271dba58..3105a321d 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .2byte 256 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 811184bd9..45260d6c4 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -7,7 +7,7 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .2byte 256 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 1 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 07a795f3a..815a6a9e1 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -7,7 +7,7 @@ Route110_TrickHouseCorridor: @ 8485B84 .2byte 246 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 0ed34b2d1..86e923bb4 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd: @ 8485B68 .2byte 245 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 5a90430fd..7eb37293a 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEntrance: @ 8485B4C .2byte 244 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index c5620a2ce..1b8a7249b 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .2byte 247 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 202a75774..1832db9ee 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle2: @ 8485BBC .2byte 248 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 2ad32f43f..b4f7a2ac8 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .2byte 249 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 40b394a27..5c33fa74a 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .2byte 250 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 9bb6f40b9..049a1b49b 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle5: @ 8485C10 .2byte 251 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index fa3bc610a..e312c1439 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle6: @ 8485C2C .2byte 252 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 8a9f6e6cd..d962c50ea 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle7: @ 8485C48 .2byte 253 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 8023f4478..ce6caf06e 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -7,7 +7,7 @@ Route110_TrickHousePuzzle8: @ 8485C64 .2byte 254 .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index a65a8c849..df43dd19c 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -7,7 +7,7 @@ Route111: @ 8482790 .2byte 27 .byte MAPSEC_ROUTE_111 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 2f827017f..05d4e14f1 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -7,7 +7,7 @@ Route111_OldLadysRestStop: @ 8483DC4 .2byte 64 .byte MAPSEC_ROUTE_111 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 909277b85..79e7c76de 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -7,7 +7,7 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .2byte 60 .byte MAPSEC_ROUTE_111 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 24589a71e..01bf8a437 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -7,7 +7,7 @@ Route112: @ 84827AC .2byte 28 .byte MAPSEC_ROUTE_112 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index dff57293e..8a650439d 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -7,7 +7,7 @@ Route112_CableCarStation: @ 8483DE0 .2byte 118 .byte MAPSEC_ROUTE_112 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 3ed0f5455..bbcb77d41 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -7,7 +7,7 @@ Route113: @ 84827C8 .2byte 29 .byte MAPSEC_ROUTE_113 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 5298c41c2..77ecfd002 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -7,7 +7,7 @@ Route113_GlassWorkshop: @ 8485CB8 .2byte 67 .byte MAPSEC_ROUTE_113 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index d717c1235..ab90821ee 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -7,7 +7,7 @@ Route114: @ 84827E4 .2byte 30 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 01ac3e4dd..459238ffd 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -7,7 +7,7 @@ Route114_FossilManiacsHouse: @ 8483E18 .2byte 119 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index b3794190b..47fabca3b 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -7,7 +7,7 @@ Route114_FossilManiacsTunnel: @ 8483E34 .2byte 120 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 031ae74b6..437aaef75 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -7,7 +7,7 @@ Route114_LanettesHouse: @ 8483E50 .2byte 121 .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 56cbab012..aa91043b6 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -7,7 +7,7 @@ Route115: @ 8482800 .2byte 31 .byte MAPSEC_ROUTE_115 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 8fef8f257..ec37ba464 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -7,7 +7,7 @@ Route116: @ 848281C .2byte 32 .byte MAPSEC_ROUTE_116 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 8dad76407..566e0bf10 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -7,7 +7,7 @@ Route116_TunnelersRestHouse: @ 8483E6C .2byte 122 .byte MAPSEC_ROUTE_116 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 02804667c..3ed11a3ee 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -7,7 +7,7 @@ Route117: @ 8482838 .2byte 33 .byte MAPSEC_ROUTE_117 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index ea69af862..53e20cb54 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -7,7 +7,7 @@ Route117_PokemonDayCare: @ 8483E88 .2byte 123 .byte MAPSEC_ROUTE_117 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index ad90e8f55..47fa71638 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -7,7 +7,7 @@ Route118: @ 8482854 .2byte 34 .byte MAPSEC_ROUTE_118 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index af32f0bde..e5c3e5d54 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -7,7 +7,7 @@ Route119: @ 8482870 .2byte 35 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 8f966eaf4..ee5c6ee43 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -7,7 +7,7 @@ Route119_House: @ 8485D28 .2byte 59 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index 7d324311e..a9e533460 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -7,7 +7,7 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .2byte 271 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index d2a09b1b7..6b339317d 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -7,7 +7,7 @@ Route119_WeatherInstitute_2F: @ 8485D0C .2byte 272 .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 1fa502a2b..75419c711 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -7,7 +7,7 @@ Route120: @ 848288C .2byte 36 .byte MAPSEC_ROUTE_120 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 588540fd4..9c441064f 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -7,7 +7,7 @@ Route121: @ 84828A8 .2byte 37 .byte MAPSEC_ROUTE_121 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 9bb2b86fc..6fa3b0308 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -7,7 +7,7 @@ Route121_SafariZoneEntrance: @ 8483EA4 .2byte 124 .byte MAPSEC_ROUTE_121 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index d5bbaccf4..37d9a7a14 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -7,7 +7,7 @@ Route122: @ 84828C4 .2byte 38 .byte MAPSEC_ROUTE_122 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index e3fa357dd..f7d134894 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -7,7 +7,7 @@ Route123: @ 84828E0 .2byte 39 .byte MAPSEC_ROUTE_123 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 89b03ed88..7516de239 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -7,7 +7,7 @@ Route123_BerryMastersHouse: @ 8485CD4 .2byte 60 .byte MAPSEC_ROUTE_123 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 2ad541e81..6f4f3c540 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -7,7 +7,7 @@ Route124: @ 84828FC .2byte 40 .byte MAPSEC_ROUTE_124 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index d68c93985..fd405a128 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -7,7 +7,7 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .2byte 301 .byte MAPSEC_ROUTE_124 .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 30691d270..3e4affa65 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -7,7 +7,7 @@ Route125: @ 8482918 .2byte 41 .byte MAPSEC_ROUTE_125 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index c00086a0b..ae2dae20f 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -7,7 +7,7 @@ Route126: @ 8482934 .2byte 42 .byte MAPSEC_ROUTE_126 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index c242fe898..c92a963c7 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -7,7 +7,7 @@ Route127: @ 8482950 .2byte 43 .byte MAPSEC_ROUTE_127 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 6ced2f320..b4f08635f 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -7,7 +7,7 @@ Route128: @ 848296C .2byte 44 .byte MAPSEC_ROUTE_128 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 4128e5dec..c16a9c91f 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -7,7 +7,7 @@ Route129: @ 8482988 .2byte 45 .byte MAPSEC_ROUTE_129 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 105e4316c..2787d369b 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -7,7 +7,7 @@ Route130: @ 84829A4 .2byte 263 .byte MAPSEC_ROUTE_130 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 0151fefde..eeb09e0ea 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -7,7 +7,7 @@ Route131: @ 84829C0 .2byte 47 .byte MAPSEC_ROUTE_131 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 77392dae8..672f4d3f7 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -7,7 +7,7 @@ Route132: @ 84829DC .2byte 48 .byte MAPSEC_ROUTE_132 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 0233c4b1b..bd7ab0e10 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -7,7 +7,7 @@ Route133: @ 84829F8 .2byte 49 .byte MAPSEC_ROUTE_133 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index b4bc18251..623db96b5 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -7,7 +7,7 @@ Route134: @ 8482A14 .2byte 50 .byte MAPSEC_ROUTE_134 .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 6 .2byte 0 .byte 13 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index f26674d87..3aed4b2f2 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -7,7 +7,7 @@ RustboroCity: @ 848250C .2byte 4 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index b1e738b79..742a590e2 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -7,7 +7,7 @@ RustboroCity_CuttersHouse: @ 8483478 .2byte 98 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 56dc26994..28b4a1d1c 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_DevonCorp_1F: @ 8483344 .2byte 92 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 65046644f..f1bf1cd83 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_DevonCorp_2F: @ 8483360 .2byte 93 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 7a5968b18..2bf6129fe 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -7,7 +7,7 @@ RustboroCity_DevonCorp_3F: @ 848337C .2byte 269 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index e9754f54f..792d6a87c 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat1_1F: @ 8483424 .2byte 313 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index a07f7fba9..50fbdf6d0 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat1_2F: @ 8483440 .2byte 314 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 66e8b9e0e..271127402 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat2_1F: @ 84834B0 .2byte 294 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 8a7884e58..f8bb6826d 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat2_2F: @ 84834CC .2byte 295 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 70e622e46..9fec8f298 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -7,7 +7,7 @@ RustboroCity_Flat2_3F: @ 84834E8 .2byte 296 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index f5297aaa2..fbac65351 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -7,7 +7,7 @@ RustboroCity_Gym: @ 8483398 .2byte 94 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index e668e6327..7db64f8f9 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -7,7 +7,7 @@ RustboroCity_House1: @ 848345C .2byte 97 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index bd075650e..db3ef40f4 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -7,7 +7,7 @@ RustboroCity_House2: @ 8483494 .2byte 96 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index f03668a60..08d31197b 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -7,7 +7,7 @@ RustboroCity_House3: @ 8483504 .2byte 96 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 58a9f6075..d7126406e 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -7,7 +7,7 @@ RustboroCity_Mart: @ 8483408 .2byte 63 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index f482ba044..67070920e 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .2byte 61 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 48e731a3e..15e8537df 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .2byte 62 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 6948dc366..13138b65e 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -7,7 +7,7 @@ RustboroCity_PokemonSchool: @ 84833B4 .2byte 95 .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 998208e80..e87800965 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -7,7 +7,7 @@ RusturfTunnel: @ 8483F30 .2byte 129 .byte MAPSEC_RUSTURF_TUNNEL .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index a33e236dd..6e66b473c 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -7,7 +7,7 @@ SSTidalCorridor: @ 8484F0C .2byte 277 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 2c627ad0b..1c7e1d01c 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -7,7 +7,7 @@ SSTidalLowerDeck: @ 8484F28 .2byte 278 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 935427cae..c02176a9b 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -7,7 +7,7 @@ SSTidalRooms: @ 8484F44 .2byte 279 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index 5452be556..745e608a2 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -7,7 +7,7 @@ SafariZone_North: @ 8485158 .2byte 239 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 9e8be1352..e25a8497b 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -7,7 +7,7 @@ SafariZone_Northeast: @ 848528C .2byte 394 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index b3c98ee11..01b7e8198 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -7,7 +7,7 @@ SafariZone_Northwest: @ 848513C .2byte 238 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index b56865835..e6739ff66 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -7,7 +7,7 @@ SafariZone_RestHouse: @ 8485270 .2byte 329 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 9780b80d9..e60f44f9e 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -7,7 +7,7 @@ SafariZone_South: @ 8485190 .2byte 241 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 17d73acf8..5da814cff 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -7,7 +7,7 @@ SafariZone_Southeast: @ 84852A8 .2byte 395 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 5c82a2c3a..25115a13a 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -7,7 +7,7 @@ SafariZone_Southwest: @ 8485174 .2byte 240 .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 23aab68fe..51666baf3 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -7,7 +7,7 @@ ScorchedSlab: @ 84846BC .2byte 311 .byte MAPSEC_SCORCHED_SLAB .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 32e0cbb75..68bb92066 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Entrance: @ 84841B4 .2byte 147 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 4dd67bdb3..56bfc32cd 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room1: @ 84841D0 .2byte 148 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index bec8fc16a..bfb164520 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room2: @ 84841EC .2byte 149 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 3e6b0f5c8..c49f283e1 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room3: @ 8484208 .2byte 150 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index a45bb4f6a..e440157e1 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room4: @ 8484224 .2byte 151 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 831c85394..3cfd1b9d0 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room5: @ 8484240 .2byte 152 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 5e39909fc..e336955eb 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room6: @ 848425C .2byte 153 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index fa9e72804..9f8c89f6f 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room7: @ 8484278 .2byte 154 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 8248b89f7..f701d53f2 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room8: @ 8484294 .2byte 155 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 2fb1a3b70..8345ee188 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room9: @ 84842B0 .2byte 156 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 5e2b0c363..1061ce4c1 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -7,7 +7,7 @@ SealedChamber_InnerRoom: @ 84846A0 .2byte 304 .byte MAPSEC_SEALED_CHAMBER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 1fabd6be1..66d278fab 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -7,7 +7,7 @@ SealedChamber_OuterRoom: @ 8484684 .2byte 284 .byte MAPSEC_SEALED_CHAMBER .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 4783af7a7..ebf5eea00 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave1: @ 8484AC8 .2byte 199 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 208a27ae8..69d2cf860 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave2: @ 8484B70 .2byte 205 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 0bdfe5f0f..40a99dcdc 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave3: @ 8484C18 .2byte 211 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 490214803..1b22ee18e 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_BlueCave4: @ 8484CC0 .2byte 217 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index ad8dc034c..79c7f3e8d 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave1: @ 8484AAC .2byte 198 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 2e10374ec..030ceea85 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave2: @ 8484B54 .2byte 204 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 213364166..2bdb4838e 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave3: @ 8484BFC .2byte 210 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 2dc17b4e0..e3137603a 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_BrownCave4: @ 8484CA4 .2byte 216 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 70dcb91af..f2f0a00fc 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave1: @ 8484A90 .2byte 197 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 23f96fb4e..4d11b7da3 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave2: @ 8484B38 .2byte 203 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 68e302a71..b935650d6 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave3: @ 8484BE0 .2byte 209 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index faf3fd44b..b5240755e 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_RedCave4: @ 8484C88 .2byte 215 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 2a98c0dd7..cb9140852 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub1: @ 8484B1C .2byte 202 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index b3ccb0446..5b14ac5ac 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub2: @ 8484BC4 .2byte 208 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 7e408128e..725cbd9dc 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub3: @ 8484C6C .2byte 214 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index ea2c263bb..7dc3af57e 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -7,7 +7,7 @@ SecretBase_Shrub4: @ 8484D14 .2byte 220 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index e3951f3c1..1ca8f4374 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree1: @ 8484B00 .2byte 201 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 23e8da9b9..880f0dd90 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree2: @ 8484BA8 .2byte 207 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 61378b8a3..3cf6fef74 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree3: @ 8484C50 .2byte 213 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index b5f601189..2688c2eca 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -7,7 +7,7 @@ SecretBase_Tree4: @ 8484CF8 .2byte 219 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 1eee3cfed..b6d42f0a2 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave1: @ 8484AE4 .2byte 200 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 27d5a0ecc..08253975a 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave2: @ 8484B8C .2byte 206 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index f2e986b1c..0c1464cd9 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave3: @ 8484C34 .2byte 212 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 292672976..b20409781 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -7,7 +7,7 @@ SecretBase_YellowCave4: @ 8484CDC .2byte 218 .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 9 .2byte 0 .byte 12 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 3c02b2433..b263badba 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .2byte 168 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index b58e12335..386cf2b50 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .2byte 169 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index c34c87a10..9f1423424 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .2byte 164 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 69aa8114e..f280c6879 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .2byte 328 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 9fea56a0f..bcb536380 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .2byte 165 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 3dc8cae94..9fde2f89d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom: @ 848441C .2byte 167 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 5123f9a80..d111213f4 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .2byte 166 .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index 9100eb6de..c3542e15f 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -7,7 +7,7 @@ SingleBattleColosseum: @ 8484D30 .2byte 221 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 7f55c68fb..d634f1006 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -7,7 +7,7 @@ SkyPillar_1F: @ 8484764 .2byte 322 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 2be149c00..0379980bb 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -7,7 +7,7 @@ SkyPillar_2F: @ 8484780 .2byte 323 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index e54ede745..da58b47e5 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -7,7 +7,7 @@ SkyPillar_3F: @ 848479C .2byte 324 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 9823646f4..54c9432b5 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -7,7 +7,7 @@ SkyPillar_4F: @ 84847B8 .2byte 325 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index f72124743..84c7a9ae8 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -7,7 +7,7 @@ SkyPillar_5F: @ 84847F0 .2byte 330 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 8efd8c542..52a71aefc 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -7,7 +7,7 @@ SkyPillar_Entrance: @ 848472C .2byte 320 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 24a7a4e2b..50bc46b24 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -7,7 +7,7 @@ SkyPillar_Outside: @ 8484748 .2byte 321 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 1f99a1cb8..578341f9c 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -7,7 +7,7 @@ SkyPillar_Top: @ 848480C .2byte 331 .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 12 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index e617b0a91..e6ee88487 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -7,7 +7,7 @@ SlateportCity: @ 84824D4 .2byte 2 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index c76e6230b..7d4879fc7 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -7,7 +7,7 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .2byte 386 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index ddc1bfcef..177c05db8 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -7,7 +7,7 @@ SlateportCity_BattleTentCorridor: @ 8483130 .2byte 385 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 767410cbb..562905e49 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -7,7 +7,7 @@ SlateportCity_BattleTentLobby: @ 8483114 .2byte 384 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 8ec8c294b..6cc9cda8e 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -7,7 +7,7 @@ SlateportCity_Harbor: @ 84831D8 .2byte 88 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 8f221fcc7..102784c6f 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -7,7 +7,7 @@ SlateportCity_House1: @ 8483168 .2byte 80 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index bc4fc03ce..60faa1552 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -7,7 +7,7 @@ SlateportCity_House2: @ 84831F4 .2byte 60 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 569969de3..8fd2113cb 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -7,7 +7,7 @@ SlateportCity_Mart: @ 8483248 .2byte 63 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 88c4e349b..9cb13d8cf 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .2byte 86 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index e300ced6a..69e244a91 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -7,7 +7,7 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .2byte 87 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 2b3d99694..085db4d85 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .2byte 61 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 6070cab3c..c2bbb5097 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_2F: @ 848322C .2byte 62 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 34a3f1916..33796df81 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -7,7 +7,7 @@ SlateportCity_PokemonFanClub: @ 8483184 .2byte 85 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index d4b8e9aea..73b7c113d 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .2byte 81 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 894aabb9a..f3bc5fde2 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -7,7 +7,7 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .2byte 82 .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 0b48dbca0..ccc9c1671 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -7,7 +7,7 @@ SootopolisCity: @ 848257C .2byte 8 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 2 .2byte 0 .byte 13 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 663a64800..2d51a6b91 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_Gym_1F: @ 8483A28 .2byte 109 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 11bb3b502..420ee8f53 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_Gym_B1F: @ 8483A44 .2byte 110 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 5eaa8d470..d60dd358f 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House1: @ 8483AB4 .2byte 307 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 36daf5bb2..817b67693 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House2: @ 8483AD0 .2byte 308 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index dfe26c5ea..a5225747b 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House3: @ 8483AEC .2byte 309 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index 1275ccf91..2e2697d4d 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House4: @ 8483B08 .2byte 307 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 0d634d549..0ec392f92 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House5: @ 8483B24 .2byte 308 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 9f151e737..97d0a73e9 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House6: @ 8483B40 .2byte 309 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 7dac9a029..9318e6ebe 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -7,7 +7,7 @@ SootopolisCity_House7: @ 8483B5C .2byte 307 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index d0fa71556..96d0ea1d1 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -7,7 +7,7 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .2byte 297 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index f1fc07ae2..982ac6fa4 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -7,7 +7,7 @@ SootopolisCity_Mart: @ 8483A98 .2byte 63 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 7828f6bbb..0fd0fbf5e 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .2byte 439 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index 5ebbff88b..660f26ae2 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .2byte 440 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 537ab1709..f39608216 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .2byte 61 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 76493dcfa..0844847c8 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .2byte 62 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 82948348b..e72b6f310 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -7,7 +7,7 @@ SouthernIsland_Exterior: @ 8485238 .2byte 290 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index be575d25b..42bb8497d 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -7,7 +7,7 @@ SouthernIsland_Interior: @ 8485254 .2byte 291 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 - .byte 11 + .byte WEATHER_SHADE .byte 3 .2byte 0 .byte 13 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 94a871f6a..bda560677 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -7,7 +7,7 @@ TerraCave_End: @ 8484A3C .2byte 409 .byte MAPSEC_TERRA_CAVE .byte 0 - .byte 6 + .byte WEATHER_FOG_1 .byte 4 .2byte 0 .byte 14 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index 81c405cdf..e38dc2fa8 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -7,7 +7,7 @@ TerraCave_Entrance: @ 8484A20 .2byte 408 .byte MAPSEC_TERRA_CAVE .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 92d6c14a7..4b2c0f840 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -7,7 +7,7 @@ TradeCenter: @ 8484D4C .2byte 222 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index fba54fabd..41fddfeed 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -7,7 +7,7 @@ TrainerHill_1F: @ 84857E8 .2byte 415 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index d47e960ed..740afdba7 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -7,7 +7,7 @@ TrainerHill_2F: @ 8485804 .2byte 416 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index 60f981e3d..79597b686 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -7,7 +7,7 @@ TrainerHill_3F: @ 8485820 .2byte 417 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 6b7edf22b..8286c131a 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -7,7 +7,7 @@ TrainerHill_4F: @ 848583C .2byte 418 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index dd5daa4e2..c6ed43e08 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -7,7 +7,7 @@ TrainerHill_Elevator: @ 8485ADC .2byte 266 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index 60422a940..a45f77c99 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -7,7 +7,7 @@ TrainerHill_Entrance: @ 84857CC .2byte 414 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index c6c3e626c..e6000a2d5 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -7,7 +7,7 @@ TrainerHill_Roof: @ 8485858 .2byte 419 .byte MAPSEC_TRAINER_HILL .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 4 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 6d3603bf5..3ce516a3d 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -7,7 +7,7 @@ Underwater1: @ 8482A30 .2byte 274 .byte MAPSEC_UNDERWATER_124 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 03230042b..1109fd52a 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -7,7 +7,7 @@ Underwater2: @ 8482A4C .2byte 51 .byte MAPSEC_UNDERWATER_125 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 203cf8b3c..c132e8e84 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -7,7 +7,7 @@ Underwater3: @ 8482A68 .2byte 52 .byte MAPSEC_UNDERWATER_126 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index b5de8aa07..ec0818b57 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -7,7 +7,7 @@ Underwater4: @ 8482A84 .2byte 53 .byte MAPSEC_UNDERWATER_127 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index e6a846303..ba247e68d 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -7,7 +7,7 @@ Underwater5: @ 8482AA0 .2byte 412 .byte MAPSEC_UNDERWATER_129 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 0aadca37d..259f04eec 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -7,7 +7,7 @@ Underwater6: @ 8482ABC .2byte 410 .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 388c3510f..f04015ba8 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -7,7 +7,7 @@ Underwater7: @ 8482AD8 .2byte 411 .byte MAPSEC_UNDERWATER_UNK1 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 4aca9a734..51980c78c 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -7,7 +7,7 @@ Underwater_MarineCave: @ 84849CC .2byte 406 .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 5715c5e90..6c746e8f1 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -7,7 +7,7 @@ Underwater_Route134: @ 848464C .2byte 282 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index b39773d23..e5efbacf7 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -7,7 +7,7 @@ Underwater_SeafloorCavern: @ 8484198 .2byte 146 .byte MAPSEC_UNDERWATER_128 .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 8ca54e9fb..d6f2c2202 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -7,7 +7,7 @@ Underwater_SealedChamber: @ 8484668 .2byte 283 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 661c4d105..94b039292 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -7,7 +7,7 @@ Underwater_SootopolisCity: @ 8483F4C .2byte 130 .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 - .byte 14 + .byte WEATHER_BUBBLES .byte 5 .2byte 0 .byte 13 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index 55566ceef..ff4220697 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -7,7 +7,7 @@ UnionRoom: @ 8485120 .2byte 393 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 79438a8d4..7ce8ad751 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_29: @ 8484DBC .2byte 226 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index f5a6fde39..5735bdc9d 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_30: @ 8484DD8 .2byte 227 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index cf5318be0..be7d4d933 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_31: @ 8484DF4 .2byte 228 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 538798a4c..2040ed5c7 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_32: @ 8484E10 .2byte 229 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index c4d384729..038e5d760 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_33: @ 8484E2C .2byte 230 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 3d08bf4ba..c59bd0b7f 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -7,7 +7,7 @@ UnknownMap_25_34: @ 8484E48 .2byte 231 .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index aa176dbfd..c7bd8ee44 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -7,7 +7,7 @@ VerdanturfTown: @ 8482640 .2byte 15 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 2 + .byte WEATHER_SUNNY .byte 1 .2byte 0 .byte 13 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index bcdd211ee..22d20c23d 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .2byte 387 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index e704df2f0..0c24a5cd8 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .2byte 385 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 7c7bc244c..3afb04c31 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .2byte 384 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index a83a7f2fe..a60b166fc 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .2byte 60 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index ebc8d2083..91e9b1179 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_House: @ 8482F38 .2byte 59 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 90b1e7e0a..c1c661654 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_Mart: @ 8482EAC .2byte 63 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 5a8e1183f..d4524d031 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .2byte 61 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 0de25d4fa..77113ff7f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .2byte 62 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 7f9a923ec..26752c39d 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -7,7 +7,7 @@ VerdanturfTown_WandasHouse: @ 8482F00 .2byte 76 .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 8 .2byte 0 .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 7e13504a5..a7159f5e1 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -7,7 +7,7 @@ VictoryRoad_1F: @ 8484374 .2byte 163 .byte MAPSEC_VICTORY_ROAD .byte 0 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 107eb524f..5aa5b120e 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -7,7 +7,7 @@ VictoryRoad_B1F: @ 8484390 .2byte 285 .byte MAPSEC_VICTORY_ROAD .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 3c9453154..95e0537a4 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -7,7 +7,7 @@ VictoryRoad_B2F: @ 84843AC .2byte 286 .byte MAPSEC_VICTORY_ROAD .byte 1 - .byte 0 + .byte WEATHER_NONE .byte 4 .2byte 0 .byte 15 -- cgit v1.2.3 From 546819bc722b706a1c49a3d323b3b36d03fa612a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:39:38 -0500 Subject: Use map type constants in map headers --- data/maps.s | 2 ++ data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- .../AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- .../maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap1/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap2/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattleArenaCorridor/header.inc | 2 +- .../BattleFrontier_BattleArenaLobby/header.inc | 2 +- .../BattleFrontier_BattleDomeBattleRoom/header.inc | 2 +- .../BattleFrontier_BattleDomeCorridor/header.inc | 2 +- .../maps/BattleFrontier_BattleDomeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattleFactoryLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattlePalaceCorridor/header.inc | 2 +- .../BattleFrontier_BattlePalaceLobby/header.inc | 2 +- .../BattleFrontier_BattlePikeCorridor/header.inc | 2 +- .../maps/BattleFrontier_BattlePikeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattlePyramidLobby/header.inc | 2 +- .../BattleFrontier_BattlePyramidTop/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattleTowerCorridor/header.inc | 2 +- .../BattleFrontier_BattleTowerCorridor2/header.inc | 2 +- .../BattleFrontier_BattleTowerElevator/header.inc | 2 +- .../BattleFrontier_BattleTowerLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- data/maps/BattleFrontier_OutsideEast/header.inc | 2 +- data/maps/BattleFrontier_OutsideWest/header.inc | 2 +- .../BattleFrontier_PokemonCenter_1F/header.inc | 2 +- .../BattleFrontier_PokemonCenter_2F/header.inc | 2 +- data/maps/BattleFrontier_RankingHall/header.inc | 2 +- data/maps/BattleFrontier_ReceptionGate/header.inc | 2 +- data/maps/BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- .../CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- .../EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- .../EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- .../EverGrandeCity_PokemonLeague_1F/header.inc | 2 +- .../EverGrandeCity_PokemonLeague_2F/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- .../FallarborTown_BattleTentBattleRoom/header.inc | 2 +- .../FallarborTown_BattleTentCorridor/header.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- .../header.inc | 2 +- .../LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- .../LilycoveCity_DepartmentStore_1F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_2F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_3F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_4F/header.inc | 2 +- .../LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- .../LittlerootTown_BrendansHouse_1F/header.inc | 2 +- .../LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- .../LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- .../PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- .../PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- .../maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- .../maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- .../Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- .../maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- .../SlateportCity_BattleTentBattleRoom/header.inc | 2 +- .../SlateportCity_BattleTentCorridor/header.inc | 2 +- data/maps/SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- .../SlateportCity_SternsShipyard_1F/header.inc | 2 +- .../SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- .../SootopolisCity_LotadAndSeedotHouse/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../SootopolisCity_PokemonCenter_1F/header.inc | 2 +- .../SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- .../VerdanturfTown_BattleTentBattleRoom/header.inc | 2 +- .../VerdanturfTown_BattleTentCorridor/header.inc | 2 +- .../maps/VerdanturfTown_BattleTentLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- .../VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- include/constants/map_types.h | 25 +++++++++++++++++++ include/global.fieldmap.h | 29 ---------------------- src/battle_bg.c | 1 + src/battle_setup.c | 1 + src/bike.c | 1 + src/overworld.c | 1 + src/rom6.c | 1 + src/secret_base.c | 1 + 527 files changed, 551 insertions(+), 547 deletions(-) create mode 100755 include/constants/map_types.h diff --git a/data/maps.s b/data/maps.s index 59a6b4930..56d957139 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,4 +1,6 @@ +#include "constants/map_types.h" #include "constants/maps.h" +#include "constants/weather.h" #include "constants/region_map_sections.h" #include "constants/songs.h" #include "constants/weather.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 149f27655..53c7196e1 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -8,7 +8,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index a0971779c..75347beab 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Corridors_1F: @ 84844C4 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 12cb7e697..91ea7b76d 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index f6616f885..4197ef0c0 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Deck: @ 84844A8 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index f375e0bee..b075158dd 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -8,7 +8,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 0ef17861a..dc18c55af 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -8,7 +8,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 7 .byte 0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 5dc438acd..ce9393462 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Room_B1F: @ 848456C .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index e4bf89911..338e9a37a 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms2_1F: @ 8484588 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index fa713bf29..5482655a8 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index d552a8cac..7cbf2f30f 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms_1F: @ 84844E0 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 7b121a2d2..d75870116 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Rooms_B1F: @ 8484518 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index 0176f1637..ce2267768 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Underwater1: @ 8484550 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index 7ca32edb8..afb2287a7 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -8,7 +8,7 @@ AbandonedShip_Underwater2: @ 84845C0 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 344bdaf8c..3abc6981f 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -8,7 +8,7 @@ AlteringCave: @ 8484A58 .byte MAPSEC_ALTERING_CAVE_2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index afc0f475c..c1e109537 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -8,7 +8,7 @@ AncientTomb: @ 8484630 .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 7590ebce5..1b5dd0498 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -8,7 +8,7 @@ AquaHideout_1F: @ 8484144 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 3 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 51ec82492..14bf999a6 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -8,7 +8,7 @@ AquaHideout_B1F: @ 8484160 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 3 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 0d903e1cf..9a096ac9b 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -8,7 +8,7 @@ AquaHideout_B2F: @ 848417C .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 3 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index 242f32e61..07dc3be28 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -8,7 +8,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 2 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index ebc999cf4..4b50fff53 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -8,7 +8,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 2 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index f9d571c8e..1b0a82f3a 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -8,7 +8,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 2 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index b801c08af..493cf5c7c 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -8,7 +8,7 @@ ArtisanCave_1F: @ 84849B0 .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index 8e106ea1c..3f7bd293a 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -8,7 +8,7 @@ ArtisanCave_B1F: @ 8484994 .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index d20c65c2e..60b61c3cd 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index ba4431464..4519b0de2 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 112fb86bd..cf75d18c9 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 19d194169..5c6c65fb9 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 72caf9523..ed349c8d7 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 0d607e671..8866c0263 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index db09e9b41..99986cc7c 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index 27e2c8952..d9896fd35 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index b9fb23a03..511a09c34 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index e1fa2d524..539ca0e3f 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 701647467..e4b551740 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index d867a0daf..73e7dc952 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 3b53c9397..975ed4666 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index 0f93684c3..c3b4f41b8 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index d6fe6e340..d05767d81 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index f4fde68ad..544bb93d4 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 4274d8eee..de239780e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 15b65af63..3d7ce40b9 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index b744f348f..9c6d367d3 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 289c02455..3718fd37c 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index a0face861..239a543b0 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 9fa6b7fa3..a64b37179 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 970aadfbe..9b46bf7f7 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 18d60521c..aef5c1ea1 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 6606a9be7..539bec694 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index 13b0ebbf3..b5430947f 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 1a6e40299..074e02cc2 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index 380a5400e..f46a0f1c6 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 5d9252fbb..9820be7ae 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 9bcd28c75..01c9169ee 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -8,7 +8,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 25e88a5df..e8c45b3ec 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge1: @ 84855B8 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index 71b933474..8858adcce 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge2: @ 84855F0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 2f4b74d7e..430161a6f 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge3: @ 848560C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index 6fea64a15..b2d44e55e 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge4: @ 8485628 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index f38db8f29..231ce3b88 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge5: @ 8485660 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index 78f103166..b4a9c780b 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge6: @ 848567C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 871e16cc2..9cea5c401 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge7: @ 8485698 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 620e79304..60fb1edd2 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge8: @ 84856D0 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 37b608edf..952b6aa26 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Lounge9: @ 84856EC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index b356e7d7a..2d8befefd 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -8,7 +8,7 @@ BattleFrontier_Mart: @ 8485740 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index 3db684e8f..23698cbbf 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -8,7 +8,7 @@ BattleFrontier_OutsideEast: @ 84852C4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 2c1d3754e..886b04095 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -8,7 +8,7 @@ BattleFrontier_OutsideWest: @ 84851AC .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 283c3744a..a830633ea 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 44442a28c..c868da343 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 2e91cbfaf..2bb632ee8 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -8,7 +8,7 @@ BattleFrontier_RankingHall: @ 848559C .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index f009f93e5..38c514351 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -8,7 +8,7 @@ BattleFrontier_ReceptionGate: @ 84856B4 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index 11cf24022..8f4d0593b 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -8,7 +8,7 @@ BattleFrontier_ScottsHouse: @ 8485644 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index ef8c315d9..0e1f79120 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare01: @ 8484F60 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 41f1523cf..cf619b3cb 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare02: @ 8484F7C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 2938d5280..7640e62ce 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare03: @ 8484F98 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index ae838f26d..7739ac463 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare04: @ 8484FB4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index e893cfbcb..b44ef03a3 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare05: @ 8484FD0 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 397c7c27c..1983fce44 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare06: @ 8484FEC .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 3d9e1c2c5..c371d05a7 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare07: @ 8485008 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index af3df7eba..cfa836e3e 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare08: @ 8485024 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 2fb732618..398ed89e8 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare09: @ 8485040 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 8f95706d3..50a3db9be 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare10: @ 848505C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 8d0ffdaae..b5340bb16 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare11: @ 8485078 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index 268f24cb1..9e24c67b7 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare12: @ 8485094 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index b4d09580f..e9e78332c 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare13: @ 84850B0 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 7d43feff0..1b300f4c1 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare14: @ 84850CC .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index c67e86abe..67df053a2 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare15: @ 84850E8 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index 3026d44bd..09576c40e 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -8,7 +8,7 @@ BattlePyramidSquare16: @ 8485104 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 5bda31250..e29dd83bd 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -8,7 +8,7 @@ BirthIsland_Exterior: @ 8485794 .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index f0ea9a70a..a3278a8b6 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -8,7 +8,7 @@ BirthIsland_Harbor: @ 84857B0 .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 2b4464937..740f0d818 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_1F: @ 84842E8 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 46cac3433..64a8ea5d4 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_B1F: @ 8484358 .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index a19256b39..046c31854 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_Entrance: @ 84842CC .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 155670bf0..feb17e90a 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 12d34ac46..17a6e8a32 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 9edfd72a8..b8da3b166 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -8,7 +8,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 7e63a9023..05820c0cb 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -8,7 +8,7 @@ DesertRuins: @ 8483F68 .byte MAPSEC_DESERT_RUINS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index d3f41bd72..6190cf6b0 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -8,7 +8,7 @@ DesertUnderpass: @ 8484978 .byte MAPSEC_DESERT_UNDERPASS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index fb1270636..f3f4e41f0 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -8,7 +8,7 @@ DewfordTown: @ 84825EC .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index de821f116..169388379 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -8,7 +8,7 @@ DewfordTown_Gym: @ 8482C60 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 934a5a039..a62bfe31e 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -8,7 +8,7 @@ DewfordTown_Hall: @ 8482C7C .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 46352ccc6..2ba5bbcc9 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -8,7 +8,7 @@ DewfordTown_House1: @ 8482C0C .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 0d7070cae..487b763e8 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -8,7 +8,7 @@ DewfordTown_House2: @ 8482C98 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 8a22a27f8..95243a6ee 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index cd54f5fe0..5223c36e0 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 8d4de2924..b8bfdbd79 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -8,7 +8,7 @@ DoubleBattleColosseum: @ 8484D84 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 7401e4f2f..16da61699 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -8,7 +8,7 @@ EverGrandeCity: @ 8482598 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 3cbf3d3b7..6b091b199 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 87ee3f9b6..e3ffc75f6 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 7 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index b8170952e..1c766c26f 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 6 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 2b993b9a6..3af5f5a8e 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall1: @ 8483C58 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 9d7a836fe..f87bc28bd 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall2: @ 8483C74 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index d22707542..19fc74ed7 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall3: @ 8483C90 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 80867002f..7058f7bef 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall4: @ 8483CAC .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 1d1ac9edd..ba5428b3d 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_Hall5: @ 8483CC8 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 6918cc2f1..190433735 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame: @ 8483D00 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index b852e1c8e..dcfbeecf4 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 5 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index d43b97fbc..b04226413 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 3ee23fe99..dea51de86 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index 17d01bfae..e58c53baa 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 217647a56..5aca74ce1 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 875c190f5..8cd3539dc 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -8,7 +8,7 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 4 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index 77be7ebaa..c28bc8e50 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -8,7 +8,7 @@ FallarborTown: @ 8482624 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 0781e0c30..b884c6f66 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -8,7 +8,7 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 6e5950e85..efa4dde92 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -8,7 +8,7 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 6702e2f9d..d1f0ece92 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -8,7 +8,7 @@ FallarborTown_BattleTentLobby: @ 8482D94 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index b801201f3..fbc36a3f4 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -8,7 +8,7 @@ FallarborTown_House1: @ 8482E20 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index b30fdf515..9041fd2b2 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -8,7 +8,7 @@ FallarborTown_House2: @ 8482E3C .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 7c9be5b8f..2b29e7d43 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -8,7 +8,7 @@ FallarborTown_Mart: @ 8482D78 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 0e1402710..0c09089a1 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index f00757c91..c345b977e 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 539a797f1..11d0f1a46 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -8,7 +8,7 @@ FarawayIsland_Entrance: @ 848575C .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index a5b52d076..9b194f674 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -8,7 +8,7 @@ FarawayIsland_Interior: @ 8485778 .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_SHADE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index bdf2ec584..3a0705883 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -8,7 +8,7 @@ FieryPath: @ 8484048 .byte MAPSEC_FIERY_PATH .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 7e20bffff..6dfafd2c8 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -8,7 +8,7 @@ FortreeCity: @ 8482528 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index dadd55e02..fbfeee27b 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -8,7 +8,7 @@ FortreeCity_DecorationShop: @ 848361C .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 459db5bd5..4e462da1a 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -8,7 +8,7 @@ FortreeCity_Gym: @ 848353C .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 013caf4d2..44e9ef8a4 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -8,7 +8,7 @@ FortreeCity_House1: @ 8483520 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index b631de024..f8d160d20 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -8,7 +8,7 @@ FortreeCity_House2: @ 84835AC .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 477706e68..4b2f639d5 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -8,7 +8,7 @@ FortreeCity_House3: @ 84835C8 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 15182d88f..98f72f1ef 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -8,7 +8,7 @@ FortreeCity_House4: @ 84835E4 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 29dbe8c13..7b5f8ce27 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -8,7 +8,7 @@ FortreeCity_House5: @ 8483600 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 0a67a7b51..6cab5d440 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -8,7 +8,7 @@ FortreeCity_Mart: @ 8483590 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 02819535e..0f2db8658 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index ab03878eb..e13260f57 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index df957dc4d..d99b48f59 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -8,7 +8,7 @@ GraniteCave_1F: @ 8483F84 .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 183cece4a..9ed11de6f 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -8,7 +8,7 @@ GraniteCave_B1F: @ 8483FA0 .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 452fd1e2f..da4c70c4b 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -8,7 +8,7 @@ GraniteCave_B2F: @ 8483FBC .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 159d49277..9f355ad81 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -8,7 +8,7 @@ GraniteCave_StevensRoom: @ 8483FD8 .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 438f3bd0a..3c878c0c8 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -8,7 +8,7 @@ InsideOfTruck: @ 8484EF0 .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 6d097c21d..39408decf 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -8,7 +8,7 @@ IslandCave: @ 8484614 .byte MAPSEC_ISLAND_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 326269407..99ca54b04 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -8,7 +8,7 @@ JaggedPass: @ 848402C .byte MAPSEC_JAGGED_PASS .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 9ddad2758..4c0def95d 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -8,7 +8,7 @@ LavaridgeTown: @ 8482608 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 1257c09c0..b2a4a50fd 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index fc90b501f..d04d827c9 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index db621e67d..f7858be91 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_HerbShop: @ 8482CB4 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index b8f607e15..1d8c56290 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_House: @ 8482D08 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index f06a48f72..f6a4df95d 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_Mart: @ 8482D24 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 42a463624..1504e0176 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 7149858a8..f52965272 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index f372e381c..f4565d25a 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -8,7 +8,7 @@ LilycoveCity: @ 8482544 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 1cd935b55..d31f692c2 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -8,7 +8,7 @@ LilycoveCity_ContestHall: @ 84836C4 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index ee9660ebf..aff7cb64e 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -8,7 +8,7 @@ LilycoveCity_ContestLobby: @ 84836A8 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 166d86828..258501718 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 9b8f05106..dd38adbb8 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 23e99c981..a7375dbd7 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index ffd3d4021..92a3c5ed9 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 695b5560d..136b923e0 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 34beb40f7..fd868ce9d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 5c49de2eb..fd946aee7 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index c298bc024..7f343e860 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 32c178628..2019489b4 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index a28edee35..addb803f0 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -8,7 +8,7 @@ LilycoveCity_Harbor: @ 8483750 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index e29bdfbc5..c5dde2721 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House1: @ 8483788 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 0ffeffd03..1a6c27a93 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House2: @ 84837A4 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index fc2868a9c..73fd14e04 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House3: @ 84837C0 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 66c3636cf..d265ea010 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -8,7 +8,7 @@ LilycoveCity_House4: @ 84837DC .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 292c61623..1a92a6d69 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 9bdff8e90..b47d700a9 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 1adc065dd..9c167f300 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -8,7 +8,7 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 92bc0e9d9..6e0b34fac 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 1ae72be25..070ae9aef 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 2137aecc9..bdbb5aefa 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index ecff7b16f..772e57cba 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -8,7 +8,7 @@ LilycoveCity_UnusedMart: @ 8483718 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 8b35b2629..b416ddd62 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -8,7 +8,7 @@ LinkContestRoom1: @ 8484DA0 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index b8e3e1822..73c459674 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -8,7 +8,7 @@ LinkContestRoom2: @ 8484E64 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 5b1e2d8f3..bf12c6d30 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -8,7 +8,7 @@ LinkContestRoom3: @ 8484E80 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 6a4190ca7..675a02398 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -8,7 +8,7 @@ LinkContestRoom4: @ 8484E9C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index bf95bb2ef..da5e9ff58 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -8,7 +8,7 @@ LinkContestRoom5: @ 8484EB8 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 231f31001..153d55b34 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -8,7 +8,7 @@ LinkContestRoom6: @ 8484ED4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 5fb0a6eab..df9a5b47a 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -8,7 +8,7 @@ LittlerootTown: @ 84825B4 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 69eff71f7..364acb64a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 7b5fa7375..d4d1703f2 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 56b925c2a..23c59b082 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 496d3cf83..dfba805be 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -8,7 +8,7 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 7ba2b7e0e..3969b46fd 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -8,7 +8,7 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 65e781626..c9bdce2a1 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -8,7 +8,7 @@ MagmaHideout_1F: @ 8484828 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 50bf554d7..8fdac83d2 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_2F_1R: @ 8484844 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 376c2f232..9512d1734 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_2F_2R: @ 8484860 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index bc8816d1c..39a0710f5 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_2F_3R: @ 84848EC .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 412756e49..436103ffe 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_3F_1R: @ 848487C .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index d0ae8c4e1..b0bcd92c2 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_3F_2R: @ 8484898 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index f27df336c..a4fe7b936 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -8,7 +8,7 @@ MagmaHideout_3F_3R: @ 84848D0 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 778899830..50a1a2b99 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -8,7 +8,7 @@ MagmaHideout_4F: @ 84848B4 .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index da43bbc46..044d54304 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -8,7 +8,7 @@ MarineCave_End: @ 8484A04 .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 6432ee987..a95f2c7dd 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -8,7 +8,7 @@ MarineCave_Entrance: @ 84849E8 .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index a6a3db192..c2101da80 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -8,7 +8,7 @@ MauvilleCity: @ 84824F0 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 942859e0c..cc9a7102c 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -8,7 +8,7 @@ MauvilleCity_BikeShop: @ 8483280 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 20e6b5a09..c1626ba7f 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -8,7 +8,7 @@ MauvilleCity_GameCorner: @ 84832B8 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index e10fa76c8..9a9de6ebf 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -8,7 +8,7 @@ MauvilleCity_Gym: @ 8483264 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index b5f6b9175..43691b589 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -8,7 +8,7 @@ MauvilleCity_House1: @ 848329C .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index fe7b14fcc..8c4628462 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -8,7 +8,7 @@ MauvilleCity_House2: @ 84832D4 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 082ff6045..bb00f8dd0 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -8,7 +8,7 @@ MauvilleCity_Mart: @ 8483328 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index ddc901f44..665e25cdd 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index e4981b277..6ebef36e5 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 2b012f5b8..d21e63777 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_1F_1R: @ 8483EC0 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index e2b352406..c7d028628 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_1F_2R: @ 8483EDC .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index a90a21049..e6079dade 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_B1F_1R: @ 8483EF8 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index df6a9ee01..100c19b4e 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -8,7 +8,7 @@ MeteorFalls_B1F_2R: @ 8483F14 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index cf9796360..e01833b40 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -8,7 +8,7 @@ MeteorFalls_StevensCave: @ 8484A74 .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 90bc41a90..46b167ead 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -8,7 +8,7 @@ MirageTower_1F: @ 8484908 .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index 4a984edea..375fef35d 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -8,7 +8,7 @@ MirageTower_2F: @ 8484924 .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index c3c126d56..8f3f40f4b 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -8,7 +8,7 @@ MirageTower_3F: @ 8484940 .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index c0b51c174..ad4079d0c 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -8,7 +8,7 @@ MirageTower_4F: @ 848495C .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index eba304363..5756307eb 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -8,7 +8,7 @@ MossdeepCity: @ 8482560 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index b04ffb872..c7e781b7a 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index d0b115b37..c431f8b06 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index df190975c..af4198c83 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -8,7 +8,7 @@ MossdeepCity_Gym: @ 84838BC .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 0843eb3f4..31cb2aa2a 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House1: @ 84838D8 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index b844bd961..d89be9872 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House2: @ 84838F4 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 6e47ed443..02b2489fd 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House3: @ 8483964 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index dbd201c2e..c86b1f8af 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -8,7 +8,7 @@ MossdeepCity_House4: @ 848399C .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 72dc8a409..4086c0142 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -8,7 +8,7 @@ MossdeepCity_Mart: @ 8483948 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index e39eb8183..aef070228 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 022761465..32c2bbc28 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index c38fc57eb..c5eb7515e 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 53fb8a06a..ec580ec8e 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -8,7 +8,7 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 43b5f92cf..446d6f540 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -8,7 +8,7 @@ MossdeepCity_StevensHouse: @ 8483980 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 29c068992..17173424b 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -8,7 +8,7 @@ MtChimney: @ 8484010 .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_ASH - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 3de6d823e..864d0a0c8 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -8,7 +8,7 @@ MtChimney_CableCarStation: @ 8483DFC .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 88306a7de..bb38876c8 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -8,7 +8,7 @@ MtPyre_1F: @ 8484064 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 0afddfb49..2ed8817a6 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -8,7 +8,7 @@ MtPyre_2F: @ 8484080 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 8ccabb8c8..115479a97 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -8,7 +8,7 @@ MtPyre_3F: @ 848409C .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 22a41d25c..ed554cb5f 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -8,7 +8,7 @@ MtPyre_4F: @ 84840B8 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 47f92d2c8..1f1829279 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -8,7 +8,7 @@ MtPyre_5F: @ 84840D4 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index ceaceca41..b665007db 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -8,7 +8,7 @@ MtPyre_6F: @ 84840F0 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index c5e7576cf..b453b7691 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -8,7 +8,7 @@ MtPyre_Exterior: @ 848410C .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 29597bceb..67185120a 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -8,7 +8,7 @@ MtPyre_Summit: @ 8484128 .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_FOG_1 - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 2f8d472d2..4f92661da 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -8,7 +8,7 @@ NavelRock_B1F: @ 84858C8 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index ee2eeb102..ddf383ee2 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -8,7 +8,7 @@ NavelRock_Bottom: @ 8485AC0 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 8b11f8d93..2585dc958 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -8,7 +8,7 @@ NavelRock_Down01: @ 848598C .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 0b56cba11..5f6e48b82 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -8,7 +8,7 @@ NavelRock_Down02: @ 84859A8 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index a674e3849..2e256ec77 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -8,7 +8,7 @@ NavelRock_Down03: @ 84859C4 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index 34359e5b8..c5c1ee394 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -8,7 +8,7 @@ NavelRock_Down04: @ 84859E0 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 2be325bad..40f8cf0c9 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -8,7 +8,7 @@ NavelRock_Down05: @ 84859FC .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index c38950b20..7c9f16d60 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -8,7 +8,7 @@ NavelRock_Down06: @ 8485A18 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index 65af6ccd8..ef679ae6b 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -8,7 +8,7 @@ NavelRock_Down07: @ 8485A34 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index fd08b39ea..27ca1b317 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -8,7 +8,7 @@ NavelRock_Down08: @ 8485A50 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 9b22ca051..2dd586587 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -8,7 +8,7 @@ NavelRock_Down09: @ 8485A6C .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index 4301b5f93..b8a2123d5 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -8,7 +8,7 @@ NavelRock_Down10: @ 8485A88 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index a45e05795..9073b1b64 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -8,7 +8,7 @@ NavelRock_Down11: @ 8485AA4 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index 5509d0cde..d795e2bb9 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -8,7 +8,7 @@ NavelRock_Entrance: @ 84858AC .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index ed9234f34..ec7ea4968 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -8,7 +8,7 @@ NavelRock_Exterior: @ 8485874 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 73aab8ad6..8a145ad64 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -8,7 +8,7 @@ NavelRock_Fork: @ 84858E4 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 9e60e032f..f798d56df 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -8,7 +8,7 @@ NavelRock_Harbor: @ 8485890 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 3a1c8254d..43b9d951d 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -8,7 +8,7 @@ NavelRock_Top: @ 8485970 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_SHADE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index 41a342eb3..c409781be 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -8,7 +8,7 @@ NavelRock_Up1: @ 8485900 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index db13a9adf..a2f627a1c 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -8,7 +8,7 @@ NavelRock_Up2: @ 848591C .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index e6e140696..bce8a899f 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -8,7 +8,7 @@ NavelRock_Up3: @ 8485938 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index be297090a..02a05c79e 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -8,7 +8,7 @@ NavelRock_Up4: @ 8485954 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 08df71885..706a21563 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -8,7 +8,7 @@ NewMauville_Entrance: @ 8484470 .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 87628d4cf..a3740f48a 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -8,7 +8,7 @@ NewMauville_Inside: @ 848448C .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index de8566823..074c45320 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -8,7 +8,7 @@ OldaleTown: @ 84825D0 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 0accc508b..f188a6559 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -8,7 +8,7 @@ OldaleTown_House1: @ 8482B80 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 2d6cffcfa..6e942e50c 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -8,7 +8,7 @@ OldaleTown_House2: @ 8482B9C .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index d2bc44d39..bbc85e7cb 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -8,7 +8,7 @@ OldaleTown_Mart: @ 8482BF0 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 2a0988475..3f01beee4 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index b1399a1b0..99356ce57 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index f903637a3..34c15d53f 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -8,7 +8,7 @@ PacifidlogTown: @ 848265C .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 90098ec2c..33449542f 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House1: @ 8482F8C .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index a1433fbbc..c095f6827 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House2: @ 8482FA8 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 28d0fd8a5..5aa498141 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House3: @ 8482FC4 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index adbd42c6a..9530591f6 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House4: @ 8482FE0 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index b30fb80d3..915d053cb 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_House5: @ 8482FFC .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 6d95c3b6e..15b0044c3 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 9cc1d0470..72331ab8d 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index bd94ab120..2b8520a7b 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -8,7 +8,7 @@ PetalburgCity: @ 84824B8 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 661552e20..b6604647f 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -8,7 +8,7 @@ PetalburgCity_Gym: @ 8483034 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 00e26fe1a..c80452182 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -8,7 +8,7 @@ PetalburgCity_House1: @ 8483050 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 1a643f7e2..61b9b16ca 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -8,7 +8,7 @@ PetalburgCity_House2: @ 848306C .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 85d8331a1..92cabd5a3 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -8,7 +8,7 @@ PetalburgCity_Mart: @ 84830C0 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 336958088..1a3e764bb 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 7b1e01861..73dbb7aa4 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 68c746b58..033e19488 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -8,7 +8,7 @@ PetalburgCity_WallysHouse: @ 8483018 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index bda2a3ab5..387032076 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -8,7 +8,7 @@ PetalburgWoods: @ 8483FF4 .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte WEATHER_SHADE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 4d4583acf..98573d9a4 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -8,7 +8,7 @@ RecordCorner: @ 8484D68 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 0c76acfbc..feb3aa440 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -8,7 +8,7 @@ Route101: @ 8482678 .byte MAPSEC_ROUTE_101 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 33e22d3bd..6102e69a0 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -8,7 +8,7 @@ Route102: @ 8482694 .byte MAPSEC_ROUTE_102 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 22f0976d3..6c99d4df2 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -8,7 +8,7 @@ Route103: @ 84826B0 .byte MAPSEC_ROUTE_103 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 02019604d..1c09ae166 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -8,7 +8,7 @@ Route104: @ 84826CC .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index e67afc46c..5dab30f42 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -8,7 +8,7 @@ Route104_MrBrineysHouse: @ 8483D70 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index caf3f3f86..f1f273c73 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -8,7 +8,7 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index ca694df00..99284e566 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -8,7 +8,7 @@ Route104_Prototype: @ 8485AF8 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 87a794524..4bb9351d8 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -8,7 +8,7 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 .byte 0 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index a55cb3ede..040e26110 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -8,7 +8,7 @@ Route105: @ 84826E8 .byte MAPSEC_ROUTE_105 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index df51d4222..69ab66b03 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -8,7 +8,7 @@ Route106: @ 8482704 .byte MAPSEC_ROUTE_106 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 09a47a2ae..399096d16 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -8,7 +8,7 @@ Route107: @ 8482720 .byte MAPSEC_ROUTE_107 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 3b55160d8..a59ddf761 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -8,7 +8,7 @@ Route108: @ 848273C .byte MAPSEC_ROUTE_108 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 30f3501a5..2262cadfa 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -8,7 +8,7 @@ Route109: @ 8482758 .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index c9cbe2d23..93deeb8a9 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -8,7 +8,7 @@ Route109_SeashoreHouse: @ 8485B30 .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 92157a59d..dd66f9f3d 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -8,7 +8,7 @@ Route110: @ 8482774 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 3105a321d..0a5259894 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -8,7 +8,7 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 45260d6c4..a36613213 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -8,7 +8,7 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 .byte 0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 815a6a9e1..af28f5ed0 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -8,7 +8,7 @@ Route110_TrickHouseCorridor: @ 8485B84 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 86e923bb4..9b0436a68 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -8,7 +8,7 @@ Route110_TrickHouseEnd: @ 8485B68 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 7eb37293a..f86f11b92 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -8,7 +8,7 @@ Route110_TrickHouseEntrance: @ 8485B4C .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 1b8a7249b..cdb272aa7 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 1832db9ee..946da22a8 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle2: @ 8485BBC .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index b4f7a2ac8..0686eef43 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 5c33fa74a..05bde230f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 049a1b49b..de723c302 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle5: @ 8485C10 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index e312c1439..e5a2864de 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle6: @ 8485C2C .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index d962c50ea..5b884a138 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle7: @ 8485C48 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index ce6caf06e..def3cab3d 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle8: @ 8485C64 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index df43dd19c..3ae44b79a 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -8,7 +8,7 @@ Route111: @ 8482790 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 05d4e14f1..b58e0f3df 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -8,7 +8,7 @@ Route111_OldLadysRestStop: @ 8483DC4 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 79e7c76de..43ce6de6d 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -8,7 +8,7 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 01bf8a437..040d0d084 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -8,7 +8,7 @@ Route112: @ 84827AC .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 8a650439d..05b88a15b 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -8,7 +8,7 @@ Route112_CableCarStation: @ 8483DE0 .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index bbcb77d41..7cd391478 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -8,7 +8,7 @@ Route113: @ 84827C8 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 77ecfd002..3cbad800b 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -8,7 +8,7 @@ Route113_GlassWorkshop: @ 8485CB8 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index ab90821ee..99cda55b5 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -8,7 +8,7 @@ Route114: @ 84827E4 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 459238ffd..43749207d 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -8,7 +8,7 @@ Route114_FossilManiacsHouse: @ 8483E18 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index 47fabca3b..4892f1077 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -8,7 +8,7 @@ Route114_FossilManiacsTunnel: @ 8483E34 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 437aaef75..2b6ef1e78 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -8,7 +8,7 @@ Route114_LanettesHouse: @ 8483E50 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index aa91043b6..4490ad646 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -8,7 +8,7 @@ Route115: @ 8482800 .byte MAPSEC_ROUTE_115 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index ec37ba464..675ba4568 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -8,7 +8,7 @@ Route116: @ 848281C .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 566e0bf10..d18ac8e84 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -8,7 +8,7 @@ Route116_TunnelersRestHouse: @ 8483E6C .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 3ed11a3ee..70104035a 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -8,7 +8,7 @@ Route117: @ 8482838 .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 53e20cb54..72ba07c3a 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -8,7 +8,7 @@ Route117_PokemonDayCare: @ 8483E88 .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 47fa71638..ca2da8524 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -8,7 +8,7 @@ Route118: @ 8482854 .byte MAPSEC_ROUTE_118 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index e5c3e5d54..9e37cfdf4 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -8,7 +8,7 @@ Route119: @ 8482870 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index ee5c6ee43..50eb5482b 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -8,7 +8,7 @@ Route119_House: @ 8485D28 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index a9e533460..f5a73c34c 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -8,7 +8,7 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 6b339317d..effe5f066 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -8,7 +8,7 @@ Route119_WeatherInstitute_2F: @ 8485D0C .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 75419c711..767568015 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -8,7 +8,7 @@ Route120: @ 848288C .byte MAPSEC_ROUTE_120 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 9c441064f..6a106d24d 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -8,7 +8,7 @@ Route121: @ 84828A8 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 6fa3b0308..665eacd57 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -8,7 +8,7 @@ Route121_SafariZoneEntrance: @ 8483EA4 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 37d9a7a14..e2554ed2a 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -8,7 +8,7 @@ Route122: @ 84828C4 .byte MAPSEC_ROUTE_122 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index f7d134894..5b662b8f5 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -8,7 +8,7 @@ Route123: @ 84828E0 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_SUNNY - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 7516de239..7ae6169d6 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -8,7 +8,7 @@ Route123_BerryMastersHouse: @ 8485CD4 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 6f4f3c540..217befb9c 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -8,7 +8,7 @@ Route124: @ 84828FC .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index fd405a128..74d666591 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -8,7 +8,7 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 3e4affa65..f093b492c 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -8,7 +8,7 @@ Route125: @ 8482918 .byte MAPSEC_ROUTE_125 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index ae2dae20f..dd713fc55 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -8,7 +8,7 @@ Route126: @ 8482934 .byte MAPSEC_ROUTE_126 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index c92a963c7..76ebe06c3 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -8,7 +8,7 @@ Route127: @ 8482950 .byte MAPSEC_ROUTE_127 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index b4f08635f..5de5e3d91 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -8,7 +8,7 @@ Route128: @ 848296C .byte MAPSEC_ROUTE_128 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index c16a9c91f..936c951be 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -8,7 +8,7 @@ Route129: @ 8482988 .byte MAPSEC_ROUTE_129 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 2787d369b..99d1b8aa3 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -8,7 +8,7 @@ Route130: @ 84829A4 .byte MAPSEC_ROUTE_130 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index eeb09e0ea..cf3b18e0b 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -8,7 +8,7 @@ Route131: @ 84829C0 .byte MAPSEC_ROUTE_131 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 672f4d3f7..46587bf7d 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -8,7 +8,7 @@ Route132: @ 84829DC .byte MAPSEC_ROUTE_132 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index bd7ab0e10..9f1aad37d 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -8,7 +8,7 @@ Route133: @ 84829F8 .byte MAPSEC_ROUTE_133 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 623db96b5..cdd43da73 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -8,7 +8,7 @@ Route134: @ 8482A14 .byte MAPSEC_ROUTE_134 .byte 0 .byte WEATHER_SUNNY - .byte 6 + .byte MAP_TYPE_6 .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 3aed4b2f2..c0edf38c9 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -8,7 +8,7 @@ RustboroCity: @ 848250C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 742a590e2..26b4cc1ff 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -8,7 +8,7 @@ RustboroCity_CuttersHouse: @ 8483478 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 28b4a1d1c..855ceb419 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_1F: @ 8483344 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index f1bf1cd83..0200f56d2 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_2F: @ 8483360 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 2bf6129fe..e212f3dcc 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_3F: @ 848337C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 792d6a87c..e861278db 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat1_1F: @ 8483424 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 50fbdf6d0..960813992 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat1_2F: @ 8483440 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 271127402..1c048f61c 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_1F: @ 84834B0 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index f8bb6826d..326a374f5 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_2F: @ 84834CC .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 9fec8f298..a9914830c 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_3F: @ 84834E8 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index fbac65351..a31aeeb8b 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -8,7 +8,7 @@ RustboroCity_Gym: @ 8483398 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 7db64f8f9..9ee33359f 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -8,7 +8,7 @@ RustboroCity_House1: @ 848345C .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index db3ef40f4..f96697756 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -8,7 +8,7 @@ RustboroCity_House2: @ 8483494 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 08d31197b..aa479cb3f 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -8,7 +8,7 @@ RustboroCity_House3: @ 8483504 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index d7126406e..046285567 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -8,7 +8,7 @@ RustboroCity_Mart: @ 8483408 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 67070920e..ca5fc513d 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 15e8537df..7c2467234 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 13138b65e..4c7ca3897 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonSchool: @ 84833B4 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index e87800965..6bf405b3b 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -8,7 +8,7 @@ RusturfTunnel: @ 8483F30 .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 6e66b473c..1d892094c 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -8,7 +8,7 @@ SSTidalCorridor: @ 8484F0C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 1c7e1d01c..1e2c5b58d 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -8,7 +8,7 @@ SSTidalLowerDeck: @ 8484F28 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index c02176a9b..6f2facdcd 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -8,7 +8,7 @@ SSTidalRooms: @ 8484F44 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index 745e608a2..cbf7fae30 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -8,7 +8,7 @@ SafariZone_North: @ 8485158 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index e25a8497b..5630e462a 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -8,7 +8,7 @@ SafariZone_Northeast: @ 848528C .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 01b7e8198..526111c90 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -8,7 +8,7 @@ SafariZone_Northwest: @ 848513C .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index e6739ff66..87e506ac1 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -8,7 +8,7 @@ SafariZone_RestHouse: @ 8485270 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index e60f44f9e..160cfea7d 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -8,7 +8,7 @@ SafariZone_South: @ 8485190 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 5da814cff..f87a4db6a 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -8,7 +8,7 @@ SafariZone_Southeast: @ 84852A8 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 25115a13a..28bd8c761 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -8,7 +8,7 @@ SafariZone_Southwest: @ 8485174 .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 51666baf3..eb61455fa 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -8,7 +8,7 @@ ScorchedSlab: @ 84846BC .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 68bb92066..dc62eba0c 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Entrance: @ 84841B4 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 56bfc32cd..dd0a2db3c 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room1: @ 84841D0 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index bfb164520..09be291c2 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room2: @ 84841EC .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index c49f283e1..ff514a631 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room3: @ 8484208 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index e440157e1..130f198aa 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room4: @ 8484224 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 3cfd1b9d0..594520629 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room5: @ 8484240 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index e336955eb..24c8fde98 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room6: @ 848425C .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index 9f8c89f6f..b2c247ab9 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room7: @ 8484278 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index f701d53f2..6bab8f16b 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room8: @ 8484294 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 8345ee188..b50127ffc 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room9: @ 84842B0 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 1061ce4c1..f61e4d1f9 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -8,7 +8,7 @@ SealedChamber_InnerRoom: @ 84846A0 .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 66d278fab..dd214cba6 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -8,7 +8,7 @@ SealedChamber_OuterRoom: @ 8484684 .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index ebf5eea00..bfce09669 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave1: @ 8484AC8 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 69d2cf860..33555b1b1 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave2: @ 8484B70 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 40a99dcdc..0f48e009d 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave3: @ 8484C18 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 1b22ee18e..c43be047e 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_BlueCave4: @ 8484CC0 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index 79c7f3e8d..b423185f2 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave1: @ 8484AAC .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 030ceea85..e51a43f13 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave2: @ 8484B54 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 2bdb4838e..5b9fe83e4 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave3: @ 8484BFC .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index e3137603a..fc821510f 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_BrownCave4: @ 8484CA4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index f2f0a00fc..2bb11dac2 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave1: @ 8484A90 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 4d11b7da3..f0e5d976a 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave2: @ 8484B38 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index b935650d6..b62553c88 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave3: @ 8484BE0 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index b5240755e..1b7a86f06 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_RedCave4: @ 8484C88 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index cb9140852..604f32e19 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub1: @ 8484B1C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 5b14ac5ac..2454dd2ad 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub2: @ 8484BC4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 725cbd9dc..9a0f7e8d7 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub3: @ 8484C6C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 7dc3af57e..4cfdf043b 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -8,7 +8,7 @@ SecretBase_Shrub4: @ 8484D14 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 1ca8f4374..dc2c07918 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree1: @ 8484B00 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 880f0dd90..7a35c5466 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree2: @ 8484BA8 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 3cf6fef74..bffa571d5 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree3: @ 8484C50 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 2688c2eca..55f3f56f1 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -8,7 +8,7 @@ SecretBase_Tree4: @ 8484CF8 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index b6d42f0a2..69287b49f 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave1: @ 8484AE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 08253975a..98b4739e0 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave2: @ 8484B8C .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 0c1464cd9..681dc7c43 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave3: @ 8484C34 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index b20409781..edfe53d6e 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -8,7 +8,7 @@ SecretBase_YellowCave4: @ 8484CDC .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE - .byte 9 + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 .byte 8 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index b263badba..5d136baee 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 386cf2b50..867de3f37 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 9f1423424..005e502ad 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index f280c6879..df62a5cfb 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index bcb536380..9caf4d5c3 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 9fde2f89d..9b2a56e23 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideLowerRoom: @ 848441C .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index d111213f4..674ce7f6d 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index c3542e15f..f89fe0450 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -8,7 +8,7 @@ SingleBattleColosseum: @ 8484D30 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index d634f1006..1358d164c 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -8,7 +8,7 @@ SkyPillar_1F: @ 8484764 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 0379980bb..b861a2ab4 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -8,7 +8,7 @@ SkyPillar_2F: @ 8484780 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index da58b47e5..68903b8a2 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -8,7 +8,7 @@ SkyPillar_3F: @ 848479C .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 54c9432b5..f74d33ce8 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -8,7 +8,7 @@ SkyPillar_4F: @ 84847B8 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 84c7a9ae8..40c2fbe72 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -8,7 +8,7 @@ SkyPillar_5F: @ 84847F0 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 52a71aefc..5ef569e65 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -8,7 +8,7 @@ SkyPillar_Entrance: @ 848472C .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 50bc46b24..e61123f1c 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -8,7 +8,7 @@ SkyPillar_Outside: @ 8484748 .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 578341f9c..919534fc2 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -8,7 +8,7 @@ SkyPillar_Top: @ 848480C .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 12 .byte 0 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index e6ee88487..adbda2e3a 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -8,7 +8,7 @@ SlateportCity: @ 84824D4 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index 7d4879fc7..3f5e5809a 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -8,7 +8,7 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 177c05db8..6721bdef1 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -8,7 +8,7 @@ SlateportCity_BattleTentCorridor: @ 8483130 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 562905e49..46b5d595e 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -8,7 +8,7 @@ SlateportCity_BattleTentLobby: @ 8483114 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 6cc9cda8e..22b61d048 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -8,7 +8,7 @@ SlateportCity_Harbor: @ 84831D8 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 102784c6f..d61584a37 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -8,7 +8,7 @@ SlateportCity_House1: @ 8483168 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 60faa1552..3e2e6434d 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -8,7 +8,7 @@ SlateportCity_House2: @ 84831F4 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 8fd2113cb..36c3dfb57 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -8,7 +8,7 @@ SlateportCity_Mart: @ 8483248 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 9cb13d8cf..fa4366df6 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 69e244a91..dc3f5a245 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 085db4d85..abafe50fd 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index c2bbb5097..343c20512 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_2F: @ 848322C .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 33796df81..fcbe42d2c 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonFanClub: @ 8483184 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 73b7c113d..1d054f587 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -8,7 +8,7 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index f3bc5fde2..9be63a0bb 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -8,7 +8,7 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index ccc9c1671..a7d0d04d5 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -8,7 +8,7 @@ SootopolisCity: @ 848257C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_SUNNY - .byte 2 + .byte MAP_TYPE_CITY .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 2d51a6b91..aaaeb85ed 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_Gym_1F: @ 8483A28 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 420ee8f53..f2e9e2b4d 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_Gym_B1F: @ 8483A44 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 1 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index d60dd358f..e72841363 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House1: @ 8483AB4 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 817b67693..555c1c7a1 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House2: @ 8483AD0 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index a5225747b..da684a632 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House3: @ 8483AEC .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index 2e2697d4d..badfcc201 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House4: @ 8483B08 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 0ec392f92..bf52a354f 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House5: @ 8483B24 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 97d0a73e9..82decfbba 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House6: @ 8483B40 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 9318e6ebe..27afdc4ee 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -8,7 +8,7 @@ SootopolisCity_House7: @ 8483B5C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 96d0ea1d1..573b465ba 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -8,7 +8,7 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 982ac6fa4..66400ad1d 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -8,7 +8,7 @@ SootopolisCity_Mart: @ 8483A98 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 0fd0fbf5e..b9b717298 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index 660f26ae2..0630ba749 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index f39608216..d50ba8f01 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 0844847c8..380f346a6 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index e72b6f310..f7498c070 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -8,7 +8,7 @@ SouthernIsland_Exterior: @ 8485238 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_NONE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 42bb8497d..eb5e1d572 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -8,7 +8,7 @@ SouthernIsland_Interior: @ 8485254 .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_SHADE - .byte 3 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index bda560677..b84a1a071 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -8,7 +8,7 @@ TerraCave_End: @ 8484A3C .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_FOG_1 - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 .byte 0 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index e38dc2fa8..69f541f7c 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -8,7 +8,7 @@ TerraCave_Entrance: @ 8484A20 .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 4b2c0f840..497a3219d 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -8,7 +8,7 @@ TradeCenter: @ 8484D4C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index 41fddfeed..fae6fccae 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -8,7 +8,7 @@ TrainerHill_1F: @ 84857E8 .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index 740afdba7..7cb9d5e67 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -8,7 +8,7 @@ TrainerHill_2F: @ 8485804 .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index 79597b686..f9834ed5f 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -8,7 +8,7 @@ TrainerHill_3F: @ 8485820 .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 8286c131a..59c339112 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -8,7 +8,7 @@ TrainerHill_4F: @ 848583C .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index c6ed43e08..ca48bb823 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -8,7 +8,7 @@ TrainerHill_Elevator: @ 8485ADC .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index a45f77c99..91b6cf345 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -8,7 +8,7 @@ TrainerHill_Entrance: @ 84857CC .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index e6000a2d5..f70f69aa0 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -8,7 +8,7 @@ TrainerHill_Roof: @ 8485858 .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 .byte 0 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 3ce516a3d..d62735bb8 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -8,7 +8,7 @@ Underwater1: @ 8482A30 .byte MAPSEC_UNDERWATER_124 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 1109fd52a..bc71590ea 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -8,7 +8,7 @@ Underwater2: @ 8482A4C .byte MAPSEC_UNDERWATER_125 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index c132e8e84..83fbe6155 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -8,7 +8,7 @@ Underwater3: @ 8482A68 .byte MAPSEC_UNDERWATER_126 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index ec0818b57..2f826994b 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -8,7 +8,7 @@ Underwater4: @ 8482A84 .byte MAPSEC_UNDERWATER_127 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index ba247e68d..9cdd79bf7 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -8,7 +8,7 @@ Underwater5: @ 8482AA0 .byte MAPSEC_UNDERWATER_129 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 259f04eec..2da188f55 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -8,7 +8,7 @@ Underwater6: @ 8482ABC .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index f04015ba8..d9e75b02b 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -8,7 +8,7 @@ Underwater7: @ 8482AD8 .byte MAPSEC_UNDERWATER_UNK1 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 51980c78c..f8de0fb73 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -8,7 +8,7 @@ Underwater_MarineCave: @ 84849CC .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 6c746e8f1..42c890ef6 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -8,7 +8,7 @@ Underwater_Route134: @ 848464C .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index e5efbacf7..96c31fa88 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -8,7 +8,7 @@ Underwater_SeafloorCavern: @ 8484198 .byte MAPSEC_UNDERWATER_128 .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index d6f2c2202..b2fa29ceb 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -8,7 +8,7 @@ Underwater_SealedChamber: @ 8484668 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 94b039292..35d0891ad 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -8,7 +8,7 @@ Underwater_SootopolisCity: @ 8483F4C .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte WEATHER_BUBBLES - .byte 5 + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index ff4220697..436c39614 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -8,7 +8,7 @@ UnionRoom: @ 8485120 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 7ce8ad751..cdeeb4207 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_29: @ 8484DBC .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 5735bdc9d..5648f0715 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_30: @ 8484DD8 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index be7d4d933..6e87bdc75 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_31: @ 8484DF4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 2040ed5c7..d899a6e51 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_32: @ 8484E10 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 038e5d760..bd048756d 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_33: @ 8484E2C .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index c59bd0b7f..33b51a404 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -8,7 +8,7 @@ UnknownMap_25_34: @ 8484E48 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index c7bd8ee44..16a1a3e2a 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -8,7 +8,7 @@ VerdanturfTown: @ 8482640 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_SUNNY - .byte 1 + .byte MAP_TYPE_TOWN .2byte 0 .byte 13 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 22d20c23d..8c70d2cba 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 0c24a5cd8..bcd2185ab 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 3afb04c31..fe779c062 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index a60b166fc..015f71d0c 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 91e9b1179..599b1f59a 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_House: @ 8482F38 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index c1c661654..315a42e56 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_Mart: @ 8482EAC .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index d4524d031..5d17e03b9 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 77113ff7f..0f881653d 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 26752c39d..69eae1a16 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -8,7 +8,7 @@ VerdanturfTown_WandasHouse: @ 8482F00 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE - .byte 8 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index a7159f5e1..81e866d49 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -8,7 +8,7 @@ VictoryRoad_1F: @ 8484374 .byte MAPSEC_VICTORY_ROAD .byte 0 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 5aa5b120e..341350a7a 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -8,7 +8,7 @@ VictoryRoad_B1F: @ 8484390 .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 95e0537a4..cd3451af7 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -8,7 +8,7 @@ VictoryRoad_B2F: @ 84843AC .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE - .byte 4 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 .byte 0 diff --git a/include/constants/map_types.h b/include/constants/map_types.h new file mode 100755 index 000000000..504575859 --- /dev/null +++ b/include/constants/map_types.h @@ -0,0 +1,25 @@ +#ifndef GUARD_CONSTANTS_MAP_TYPES_H +#define GUARD_CONSTANTS_MAP_TYPES_H + +#define MAP_TYPE_0 0 +#define MAP_TYPE_TOWN 1 +#define MAP_TYPE_CITY 2 +#define MAP_TYPE_ROUTE 3 +#define MAP_TYPE_UNDERGROUND 4 +#define MAP_TYPE_UNDERWATER 5 +#define MAP_TYPE_6 6 +#define MAP_TYPE_7 7 +#define MAP_TYPE_INDOOR 8 +#define MAP_TYPE_SECRET_BASE 9 + +#define MAP_BATTLE_SCENE_NORMAL 0 +#define MAP_BATTLE_SCENE_GYM 1 +#define MAP_BATTLE_SCENE_MAGMA 2 +#define MAP_BATTLE_SCENE_AQUA 3 +#define MAP_BATTLE_SCENE_SIDNEY 4 +#define MAP_BATTLE_SCENE_PHOEBE 5 +#define MAP_BATTLE_SCENE_GLACIA 6 +#define MAP_BATTLE_SCENE_DRAKE 7 +#define MAP_BATTLE_SCENE_FRONTIER 8 + +#endif // GUARD_CONSTANTS_MAP_TYPES_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 5b2944a2b..4bec8e0c7 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -13,35 +13,6 @@ enum CONNECTION_EMERGE }; -// map types -enum -{ - MAP_TYPE_0, - MAP_TYPE_TOWN, - MAP_TYPE_CITY, - MAP_TYPE_ROUTE, - MAP_TYPE_UNDERGROUND, - MAP_TYPE_UNDERWATER, - MAP_TYPE_6, - MAP_TYPE_7, - MAP_TYPE_INDOOR, - MAP_TYPE_SECRET_BASE -}; - -// map battle scenes -enum -{ - MAP_BATTLE_SCENE_NORMAL, // 0 - MAP_BATTLE_SCENE_GYM, // 1 - MAP_BATTLE_SCENE_MAGMA, // 2 - MAP_BATTLE_SCENE_AQUA, // 3 - MAP_BATTLE_SCENE_SIDNEY, // 4 - MAP_BATTLE_SCENE_PHOEBE, // 5 - MAP_BATTLE_SCENE_GLACIA, // 6 - MAP_BATTLE_SCENE_DRAKE, // 7 - MAP_BATTLE_SCENE_FRONTIER, // 8 -}; - typedef void (*TilesetCB)(void); struct Tileset diff --git a/src/battle_bg.c b/src/battle_bg.c index d4bfd297a..0af311631 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -18,6 +18,7 @@ #include "text_window.h" #include "menu.h" #include "battle_setup.h" +#include "constants/map_types.h" struct BattleBackground { diff --git a/src/battle_setup.c b/src/battle_setup.c index c8440a35f..16612e24d 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -32,6 +32,7 @@ #include "overworld.h" #include "field_weather.h" #include "gym_leader_rematch.h" +#include "constants/map_types.h" enum { diff --git a/src/bike.c b/src/bike.c index 87110b87b..6ffd479f7 100644 --- a/src/bike.c +++ b/src/bike.c @@ -9,6 +9,7 @@ #include "overworld.h" #include "constants/songs.h" #include "sound.h" +#include "constants/map_types.h" extern bool8 gBikeCyclingChallenge; extern u8 gBikeCollisions; diff --git a/src/overworld.c b/src/overworld.c index d4cb25e6c..9cbc8dc52 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -57,6 +57,7 @@ #include "malloc.h" #include "gpu_regs.h" #include "link_rfu.h" +#include "constants/map_types.h" // event scripts extern const u8 EventScript_WhiteOut[]; diff --git a/src/rom6.c b/src/rom6.c index 78cbbe2de..cc146fc94 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -15,6 +15,7 @@ #include "sound.h" #include "sprite.h" #include "task.h" +#include "constants/map_types.h" // static functions static void task08_080C9820(u8 taskId); diff --git a/src/secret_base.c b/src/secret_base.c index b2fd54eb8..2e127dd84 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -39,6 +39,7 @@ #include "link.h" #include "tv.h" #include "secret_base.h" +#include "constants/map_types.h" extern void mapldr_default(void); -- cgit v1.2.3 From 94650495c669f673c59f4912b805b51360c0797a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 12 Jul 2018 22:45:41 -0500 Subject: Use map battle scene constants in map headers --- data/maps/AbandonedShip_CaptainsOffice/header.inc | 2 +- data/maps/AbandonedShip_Corridors_1F/header.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorCorridors/header.inc | 2 +- data/maps/AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- data/maps/AbandonedShip_Underwater1/header.inc | 2 +- data/maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap1/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap2/header.inc | 2 +- data/maps/AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleArenaLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleDomeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePalaceLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc | 2 +- data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc | 2 +- data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidLobby/header.inc | 2 +- data/maps/BattleFrontier_BattlePyramidTop/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerCorridor2/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerElevator/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerLobby/header.inc | 2 +- data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- data/maps/BattleFrontier_OutsideEast/header.inc | 2 +- data/maps/BattleFrontier_OutsideWest/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_1F/header.inc | 2 +- data/maps/BattleFrontier_PokemonCenter_2F/header.inc | 2 +- data/maps/BattleFrontier_RankingHall/header.inc | 2 +- data/maps/BattleFrontier_ReceptionGate/header.inc | 2 +- data/maps/BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 2 +- data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_1F/header.inc | 2 +- data/maps/DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- data/maps/EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- data/maps/EverGrandeCity_HallOfFame/header.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_1F/header.inc | 2 +- data/maps/EverGrandeCity_PokemonLeague_2F/header.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- data/maps/FallarborTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/FallarborTown_BattleTentCorridor/header.inc | 2 +- data/maps/FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_1F/header.inc | 2 +- data/maps/FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- data/maps/FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_1F/header.inc | 2 +- data/maps/FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- data/maps/LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- data/maps/LilycoveCity_ContestLobby/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreElevator/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_1F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_2F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_3F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_4F/header.inc | 2 +- data/maps/LilycoveCity_DepartmentStore_5F/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- data/maps/LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 2 +- data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_BrendansHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_1F/header.inc | 2 +- data/maps/LittlerootTown_MaysHouse_2F/header.inc | 2 +- data/maps/LittlerootTown_ProfessorBirchsLab/header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_1F/header.inc | 2 +- data/maps/MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 2 +- data/maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- data/maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_1F/header.inc | 2 +- data/maps/OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_1F/header.inc | 2 +- data/maps/PacifidlogTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_1F/header.inc | 2 +- data/maps/PetalburgCity_PokemonCenter_2F/header.inc | 2 +- data/maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- data/maps/Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc | 2 +- data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc | 2 +- data/maps/Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- data/maps/Route110_TrickHouseEntrance/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle1/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle2/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle3/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle4/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle5/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle6/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle7/header.inc | 2 +- data/maps/Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111_OldLadysRestStop/header.inc | 2 +- data/maps/Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- data/maps/Route114_FossilManiacsHouse/header.inc | 2 +- data/maps/Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- data/maps/Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- data/maps/Route119_WeatherInstitute_1F/header.inc | 2 +- data/maps/Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- data/maps/Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- data/maps/Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- data/maps/Route124_DivingTreasureHuntersHouse/header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- data/maps/RustboroCity_CuttersHouse/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- data/maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_1F/header.inc | 2 +- data/maps/RustboroCity_PokemonCenter_2F/header.inc | 2 +- data/maps/RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- data/maps/ShoalCave_HighTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_HighTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideInnerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideLowerRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity_BattleTentBattleRoom/header.inc | 2 +- data/maps/SlateportCity_BattleTentCorridor/header.inc | 2 +- data/maps/SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_1F/header.inc | 2 +- data/maps/SlateportCity_OceanicMuseum_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SlateportCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SlateportCity_PokemonFanClub/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_1F/header.inc | 2 +- data/maps/SlateportCity_SternsShipyard_2F/header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc | 2 +- data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_1F/header.inc | 2 +- data/maps/SootopolisCity_PokemonCenter_2F/header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- data/maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- data/maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentCorridor/header.inc | 2 +- data/maps/VerdanturfTown_BattleTentLobby/header.inc | 2 +- data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_1F/header.inc | 2 +- data/maps/VerdanturfTown_PokemonCenter_2F/header.inc | 2 +- data/maps/VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- 518 files changed, 518 insertions(+), 518 deletions(-) diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 53c7196e1..21573c079 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -11,5 +11,5 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 75347beab..0ffb5d1f7 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Corridors_1F: @ 84844C4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 91ea7b76d..5e4eb1dd6 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Corridors_B1F: @ 84844FC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 4197ef0c0..a9f8945d9 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Deck: @ 84844A8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index b075158dd..6645c9d96 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -11,5 +11,5 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index dc18c55af..5cc5bf0ad 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -11,5 +11,5 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 7 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index ce9393462..4e6212d01 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Room_B1F: @ 848456C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 338e9a37a..8e004365e 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Rooms2_1F: @ 8484588 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 5482655a8..2f64a6315 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 7cbf2f30f..9ee2f40bc 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Rooms_1F: @ 84844E0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index d75870116..d6f656e3b 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Rooms_B1F: @ 8484518 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index ce2267768..82fbdc0e9 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Underwater1: @ 8484550 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index afb2287a7..c26d65df0 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -11,5 +11,5 @@ AbandonedShip_Underwater2: @ 84845C0 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 3abc6981f..4796b37ff 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -11,5 +11,5 @@ AlteringCave: @ 8484A58 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index c1e109537..a314ad3ba 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -11,5 +11,5 @@ AncientTomb: @ 8484630 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 1b5dd0498..c632eb204 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -11,5 +11,5 @@ AquaHideout_1F: @ 8484144 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 14bf999a6..ba017fb56 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -11,5 +11,5 @@ AquaHideout_B1F: @ 8484160 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 9a096ac9b..ea15240b9 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -11,5 +11,5 @@ AquaHideout_B2F: @ 848417C .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index 07dc3be28..455941160 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -11,5 +11,5 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index 4b50fff53..b4e2e712e 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -11,5 +11,5 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index 1b0a82f3a..7abe192b6 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -11,5 +11,5 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index 493cf5c7c..a69128ee7 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -11,5 +11,5 @@ ArtisanCave_1F: @ 84849B0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index 3f7bd293a..aba179fc6 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -11,5 +11,5 @@ ArtisanCave_B1F: @ 8484994 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 60b61c3cd..8332c4236 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index 4519b0de2..2ed587f6e 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index cf75d18c9..5c02e0c8a 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleArenaLobby: @ 848544C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 5c6c65fb9..3f1eb25b2 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index ed349c8d7..940ba24e6 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 8866c0263..5d1a7eb82 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index 99986cc7c..e35435b27 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index d9896fd35..cef72bc09 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 511a09c34..d56a2a23d 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index 539ca0e3f..3dc5d23cc 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index e4b551740..d63d3b268 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index 73e7dc952..ff8af8ca8 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 975ed4666..060013cce 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index c3b4f41b8..574d0cbab 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index d05767d81..239c31721 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index 544bb93d4..dcb088c27 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index de239780e..1ee69c077 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 3d7ce40b9..68ca30546 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index 9c6d367d3..5e0afedb5 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 3718fd37c..ccaa1cbca 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index 239a543b0..a92f009dd 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index a64b37179..6da314304 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 9b46bf7f7..28de39cad 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index aef5c1ea1..797022beb 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 539bec694..90ae26c25 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index b5430947f..bd2d38b37 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 074e02cc2..94e46b196 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index f46a0f1c6..fa1e08faf 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 9820be7ae..e16e2a700 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 01c9169ee..727322b94 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -11,5 +11,5 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index e8c45b3ec..a4cf64a78 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge1: @ 84855B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index 8858adcce..c363d54bf 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge2: @ 84855F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 430161a6f..e5649a369 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge3: @ 848560C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index b2d44e55e..a9da9677c 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge4: @ 8485628 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index 231ce3b88..7f1142f2d 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge5: @ 8485660 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index b4a9c780b..e07dd297f 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge6: @ 848567C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 9cea5c401..22797d04e 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge7: @ 8485698 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 60fb1edd2..5494c964f 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge8: @ 84856D0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 952b6aa26..5248720c7 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Lounge9: @ 84856EC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 2d8befefd..4b3e7f79a 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -11,5 +11,5 @@ BattleFrontier_Mart: @ 8485740 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index 23698cbbf..a30a148c2 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -11,5 +11,5 @@ BattleFrontier_OutsideEast: @ 84852C4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 886b04095..a42ac30ff 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -11,5 +11,5 @@ BattleFrontier_OutsideWest: @ 84851AC .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index a830633ea..a136e803d 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index c868da343..4cd607aef 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 2bb632ee8..6fcb187ed 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -11,5 +11,5 @@ BattleFrontier_RankingHall: @ 848559C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 38c514351..88f806e83 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -11,5 +11,5 @@ BattleFrontier_ReceptionGate: @ 84856B4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index 8f4d0593b..0fbbb55e3 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -11,5 +11,5 @@ BattleFrontier_ScottsHouse: @ 8485644 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index 0e1f79120..bcbc06c90 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare01: @ 8484F60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index cf619b3cb..24255ea1a 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare02: @ 8484F7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 7640e62ce..21e15dc82 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare03: @ 8484F98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 7739ac463..fae10152a 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare04: @ 8484FB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index b44ef03a3..17e05fc19 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare05: @ 8484FD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 1983fce44..9a1543a33 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare06: @ 8484FEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index c371d05a7..78d3cf7f4 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare07: @ 8485008 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index cfa836e3e..de960bab0 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare08: @ 8485024 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 398ed89e8..96b2beb37 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare09: @ 8485040 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 50a3db9be..37901889f 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare10: @ 848505C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index b5340bb16..c188ecb86 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare11: @ 8485078 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index 9e24c67b7..11e6c7b98 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare12: @ 8485094 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index e9e78332c..2f5746143 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare13: @ 84850B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 1b300f4c1..5926a9d2a 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare14: @ 84850CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 67df053a2..e65db912d 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare15: @ 84850E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index 09576c40e..f8f97b671 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -11,5 +11,5 @@ BattlePyramidSquare16: @ 8485104 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index e29dd83bd..dabad3a71 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -11,5 +11,5 @@ BirthIsland_Exterior: @ 8485794 .byte MAP_TYPE_INDOOR .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index a3278a8b6..f2493d738 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -11,5 +11,5 @@ BirthIsland_Harbor: @ 84857B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 740f0d818..384d08bd7 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_1F: @ 84842E8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 64a8ea5d4..d8dab3bea 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_B1F: @ 8484358 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 046c31854..d42f912da 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_Entrance: @ 84842CC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index feb17e90a..b8edb52bc 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 17a6e8a32..8d0f83892 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index b8da3b166..00e07549e 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -11,5 +11,5 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 05820c0cb..16e2ce55a 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -11,5 +11,5 @@ DesertRuins: @ 8483F68 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 6190cf6b0..c4f3a05c7 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -11,5 +11,5 @@ DesertUnderpass: @ 8484978 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index f3f4e41f0..c905fd606 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -11,5 +11,5 @@ DewfordTown: @ 84825EC .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 169388379..4463cc40e 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -11,5 +11,5 @@ DewfordTown_Gym: @ 8482C60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index a62bfe31e..1ba44b49d 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -11,5 +11,5 @@ DewfordTown_Hall: @ 8482C7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 2ba5bbcc9..219c70fc3 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -11,5 +11,5 @@ DewfordTown_House1: @ 8482C0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 487b763e8..248b7a990 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -11,5 +11,5 @@ DewfordTown_House2: @ 8482C98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 95243a6ee..6813134f9 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 5223c36e0..43485dcad 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index b8bfdbd79..6bfc00393 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -11,5 +11,5 @@ DoubleBattleColosseum: @ 8484D84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 16da61699..2bebe5d12 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -11,5 +11,5 @@ EverGrandeCity: @ 8482598 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 6b091b199..03ab762db 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index e3ffc75f6..fedc35c76 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 7 + .byte MAP_BATTLE_SCENE_DRAKE diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 1c766c26f..dd23d11ef 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 6 + .byte MAP_BATTLE_SCENE_GLACIA diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 3af5f5a8e..b055ba8b1 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall1: @ 8483C58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index f87bc28bd..a80a688e0 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall2: @ 8483C74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index 19fc74ed7..18a9d90dc 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall3: @ 8483C90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 7058f7bef..1aeb8e6a2 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall4: @ 8483CAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index ba5428b3d..dd82e6b56 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_Hall5: @ 8483CC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 190433735..c575b2f08 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_HallOfFame: @ 8483D00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index dcfbeecf4..64bcaec0d 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 5 + .byte MAP_BATTLE_SCENE_PHOEBE diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index b04226413..46af6f51e 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index dea51de86..163663bb9 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index e58c53baa..c6a86baa5 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 5aca74ce1..61370c18d 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 8cd3539dc..ce3356a95 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -11,5 +11,5 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 4 + .byte MAP_BATTLE_SCENE_SIDNEY diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index c28bc8e50..0c2053b8b 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -11,5 +11,5 @@ FallarborTown: @ 8482624 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index b884c6f66..81dbad44a 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -11,5 +11,5 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index efa4dde92..4e9484d11 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -11,5 +11,5 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index d1f0ece92..416d700d0 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -11,5 +11,5 @@ FallarborTown_BattleTentLobby: @ 8482D94 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index fbc36a3f4..aa182e2ed 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -11,5 +11,5 @@ FallarborTown_House1: @ 8482E20 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 9041fd2b2..c8c22eacf 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -11,5 +11,5 @@ FallarborTown_House2: @ 8482E3C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 2b29e7d43..3119638bf 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -11,5 +11,5 @@ FallarborTown_Mart: @ 8482D78 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 0c09089a1..65df98a81 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index c345b977e..5308b4e09 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 11d0f1a46..e06051d7e 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -11,5 +11,5 @@ FarawayIsland_Entrance: @ 848575C .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index 9b194f674..b45ac71c3 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -11,5 +11,5 @@ FarawayIsland_Interior: @ 8485778 .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 3a0705883..3c9f51bc1 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -11,5 +11,5 @@ FieryPath: @ 8484048 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 6dfafd2c8..3f671fb6c 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -11,5 +11,5 @@ FortreeCity: @ 8482528 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index fbfeee27b..651b37488 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -11,5 +11,5 @@ FortreeCity_DecorationShop: @ 848361C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 4e462da1a..54a45633d 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -11,5 +11,5 @@ FortreeCity_Gym: @ 848353C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 44e9ef8a4..1c106b8f5 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -11,5 +11,5 @@ FortreeCity_House1: @ 8483520 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index f8d160d20..1e20a0227 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -11,5 +11,5 @@ FortreeCity_House2: @ 84835AC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 4b2f639d5..f2d53219a 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -11,5 +11,5 @@ FortreeCity_House3: @ 84835C8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 98f72f1ef..efc5f06be 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -11,5 +11,5 @@ FortreeCity_House4: @ 84835E4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 7b5f8ce27..c4d07f46b 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -11,5 +11,5 @@ FortreeCity_House5: @ 8483600 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 6cab5d440..5179187be 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -11,5 +11,5 @@ FortreeCity_Mart: @ 8483590 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 0f2db8658..9f2b78dd4 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index e13260f57..ccfc5bd09 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index d99b48f59..4a754207b 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -11,5 +11,5 @@ GraniteCave_1F: @ 8483F84 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 9ed11de6f..beb7fdb83 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -11,5 +11,5 @@ GraniteCave_B1F: @ 8483FA0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index da4c70c4b..0eb017bc4 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -11,5 +11,5 @@ GraniteCave_B2F: @ 8483FBC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 9f355ad81..78df1ff83 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -11,5 +11,5 @@ GraniteCave_StevensRoom: @ 8483FD8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 3c878c0c8..51f499ee4 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -11,5 +11,5 @@ InsideOfTruck: @ 8484EF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 39408decf..a56a3e4d0 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -11,5 +11,5 @@ IslandCave: @ 8484614 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 99ca54b04..797760e91 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -11,5 +11,5 @@ JaggedPass: @ 848402C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 4c0def95d..006896453 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -11,5 +11,5 @@ LavaridgeTown: @ 8482608 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index b2a4a50fd..6ea20174c 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index d04d827c9..579c1dd3e 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index f7858be91..418632b28 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_HerbShop: @ 8482CB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 1d8c56290..9a350db79 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_House: @ 8482D08 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index f6a4df95d..30683052b 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_Mart: @ 8482D24 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 1504e0176..e657a688a 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index f52965272..3d40c93cf 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index f4565d25a..dafbfaccd 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -11,5 +11,5 @@ LilycoveCity: @ 8482544 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index d31f692c2..2049fd74c 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -11,5 +11,5 @@ LilycoveCity_ContestHall: @ 84836C4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index aff7cb64e..6aba3e416 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -11,5 +11,5 @@ LilycoveCity_ContestLobby: @ 84836A8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 258501718..a2737b05b 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index dd38adbb8..112a6e8d7 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index a7375dbd7..0c8cc574d 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 92a3c5ed9..cd6ded7d6 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 136b923e0..bae2b837d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index fd868ce9d..88ca3ece3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index fd946aee7..1753be637 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 7f343e860..c9b0870fa 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 2019489b4..62d836d56 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index addb803f0..7f970b463 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -11,5 +11,5 @@ LilycoveCity_Harbor: @ 8483750 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index c5dde2721..4cc0a8061 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -11,5 +11,5 @@ LilycoveCity_House1: @ 8483788 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 1a6c27a93..988b7fa4c 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -11,5 +11,5 @@ LilycoveCity_House2: @ 84837A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 73fd14e04..41f01234c 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -11,5 +11,5 @@ LilycoveCity_House3: @ 84837C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index d265ea010..656e60bf3 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -11,5 +11,5 @@ LilycoveCity_House4: @ 84837DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 1a92a6d69..0d6faebe8 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index b47d700a9..641859ac6 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 9c167f300..6a0ddfebc 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -11,5 +11,5 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 6e0b34fac..c040d7715 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 070ae9aef..e9c27fd81 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index bdbb5aefa..78102855c 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -11,5 +11,5 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 772e57cba..0384e495f 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -11,5 +11,5 @@ LilycoveCity_UnusedMart: @ 8483718 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index b416ddd62..9aa0c9cc7 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -11,5 +11,5 @@ LinkContestRoom1: @ 8484DA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 73c459674..342ed7d0b 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -11,5 +11,5 @@ LinkContestRoom2: @ 8484E64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index bf12c6d30..ff29d7e87 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -11,5 +11,5 @@ LinkContestRoom3: @ 8484E80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 675a02398..025e5971e 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -11,5 +11,5 @@ LinkContestRoom4: @ 8484E9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index da5e9ff58..7c145d0e4 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -11,5 +11,5 @@ LinkContestRoom5: @ 8484EB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 153d55b34..939d56426 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -11,5 +11,5 @@ LinkContestRoom6: @ 8484ED4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index df9a5b47a..db13d6def 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -11,5 +11,5 @@ LittlerootTown: @ 84825B4 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 364acb64a..6224e7a50 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -11,5 +11,5 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index d4d1703f2..ec7eb66ce 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -11,5 +11,5 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 23c59b082..7681d9a83 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -11,5 +11,5 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index dfba805be..9e5d0c807 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -11,5 +11,5 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 3969b46fd..3e55729a8 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -11,5 +11,5 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index c9bdce2a1..851f56278 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -11,5 +11,5 @@ MagmaHideout_1F: @ 8484828 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 8fdac83d2..d8118281f 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_2F_1R: @ 8484844 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 9512d1734..1de48fb62 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_2F_2R: @ 8484860 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 39a0710f5..b37419278 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_2F_3R: @ 84848EC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 436103ffe..d5347ed25 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_3F_1R: @ 848487C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index b0bcd92c2..45cda066b 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_3F_2R: @ 8484898 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index a4fe7b936..347ec1897 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -11,5 +11,5 @@ MagmaHideout_3F_3R: @ 84848D0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 50a1a2b99..f11c5eadd 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -11,5 +11,5 @@ MagmaHideout_4F: @ 84848B4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 044d54304..36bff96d6 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -11,5 +11,5 @@ MarineCave_End: @ 8484A04 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index a95f2c7dd..9feb17fe2 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -11,5 +11,5 @@ MarineCave_Entrance: @ 84849E8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index c2101da80..f6aadf1ff 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -11,5 +11,5 @@ MauvilleCity: @ 84824F0 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index cc9a7102c..baa4f18d5 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -11,5 +11,5 @@ MauvilleCity_BikeShop: @ 8483280 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index c1626ba7f..45fd23da0 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -11,5 +11,5 @@ MauvilleCity_GameCorner: @ 84832B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index 9a9de6ebf..736b491db 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -11,5 +11,5 @@ MauvilleCity_Gym: @ 8483264 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 43691b589..6a29041cc 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -11,5 +11,5 @@ MauvilleCity_House1: @ 848329C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 8c4628462..3fc04798e 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -11,5 +11,5 @@ MauvilleCity_House2: @ 84832D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index bb00f8dd0..3722f4565 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -11,5 +11,5 @@ MauvilleCity_Mart: @ 8483328 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 665e25cdd..659176f80 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 6ebef36e5..462fdc47d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index d21e63777..abf0e85c5 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -11,5 +11,5 @@ MeteorFalls_1F_1R: @ 8483EC0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index c7d028628..a0d074121 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -11,5 +11,5 @@ MeteorFalls_1F_2R: @ 8483EDC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index e6079dade..078998891 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -11,5 +11,5 @@ MeteorFalls_B1F_1R: @ 8483EF8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 100c19b4e..dabf884b4 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -11,5 +11,5 @@ MeteorFalls_B1F_2R: @ 8483F14 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index e01833b40..7236159f3 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -11,5 +11,5 @@ MeteorFalls_StevensCave: @ 8484A74 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 46b167ead..584ed3f7f 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -11,5 +11,5 @@ MirageTower_1F: @ 8484908 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index 375fef35d..03f762758 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -11,5 +11,5 @@ MirageTower_2F: @ 8484924 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index 8f3f40f4b..3930ca2ba 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -11,5 +11,5 @@ MirageTower_3F: @ 8484940 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index ad4079d0c..505e671eb 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -11,5 +11,5 @@ MirageTower_4F: @ 848495C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 5756307eb..f5196d035 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -11,5 +11,5 @@ MossdeepCity: @ 8482560 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index c7e781b7a..302f13d7e 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index c431f8b06..86e796c52 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index af4198c83..1b325fc9a 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -11,5 +11,5 @@ MossdeepCity_Gym: @ 84838BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 31cb2aa2a..25b8f5558 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -11,5 +11,5 @@ MossdeepCity_House1: @ 84838D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index d89be9872..718ed1f1a 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -11,5 +11,5 @@ MossdeepCity_House2: @ 84838F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 02b2489fd..53aeb0a29 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -11,5 +11,5 @@ MossdeepCity_House3: @ 8483964 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index c86b1f8af..41cbc6a7a 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -11,5 +11,5 @@ MossdeepCity_House4: @ 848399C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 4086c0142..659c7e133 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -11,5 +11,5 @@ MossdeepCity_Mart: @ 8483948 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index aef070228..75f151c51 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 32c2bbc28..5a98563b8 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index c5eb7515e..a0dd1e050 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index ec580ec8e..7f6c20a66 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -11,5 +11,5 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 446d6f540..68da46965 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -11,5 +11,5 @@ MossdeepCity_StevensHouse: @ 8483980 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 17173424b..04bfa4a45 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -11,5 +11,5 @@ MtChimney: @ 8484010 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 864d0a0c8..e12bfbacb 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -11,5 +11,5 @@ MtChimney_CableCarStation: @ 8483DFC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index bb38876c8..241f3dff3 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -11,5 +11,5 @@ MtPyre_1F: @ 8484064 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 2ed8817a6..a542638a7 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -11,5 +11,5 @@ MtPyre_2F: @ 8484080 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 115479a97..b09729f81 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -11,5 +11,5 @@ MtPyre_3F: @ 848409C .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index ed554cb5f..bee0a548f 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -11,5 +11,5 @@ MtPyre_4F: @ 84840B8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 1f1829279..d17d64262 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -11,5 +11,5 @@ MtPyre_5F: @ 84840D4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index b665007db..a783fc7c3 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -11,5 +11,5 @@ MtPyre_6F: @ 84840F0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index b453b7691..b9b2575e8 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -11,5 +11,5 @@ MtPyre_Exterior: @ 848410C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 67185120a..d1a65792f 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -11,5 +11,5 @@ MtPyre_Summit: @ 8484128 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 4f92661da..59e9a3f59 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -11,5 +11,5 @@ NavelRock_B1F: @ 84858C8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index ddf383ee2..0711b5b81 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -11,5 +11,5 @@ NavelRock_Bottom: @ 8485AC0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 2585dc958..fd5b2c0f3 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -11,5 +11,5 @@ NavelRock_Down01: @ 848598C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 5f6e48b82..7827fe4cb 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -11,5 +11,5 @@ NavelRock_Down02: @ 84859A8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 2e256ec77..465297482 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -11,5 +11,5 @@ NavelRock_Down03: @ 84859C4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index c5c1ee394..7ee2eee47 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -11,5 +11,5 @@ NavelRock_Down04: @ 84859E0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 40f8cf0c9..3f4199195 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -11,5 +11,5 @@ NavelRock_Down05: @ 84859FC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index 7c9f16d60..189c26969 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -11,5 +11,5 @@ NavelRock_Down06: @ 8485A18 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index ef679ae6b..378b7bbd2 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -11,5 +11,5 @@ NavelRock_Down07: @ 8485A34 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index 27ca1b317..7ad3e736a 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -11,5 +11,5 @@ NavelRock_Down08: @ 8485A50 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 2dd586587..60cec1da8 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -11,5 +11,5 @@ NavelRock_Down09: @ 8485A6C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index b8a2123d5..08b2d975b 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -11,5 +11,5 @@ NavelRock_Down10: @ 8485A88 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index 9073b1b64..8182f1c41 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -11,5 +11,5 @@ NavelRock_Down11: @ 8485AA4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index d795e2bb9..a0ec2bdc2 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -11,5 +11,5 @@ NavelRock_Entrance: @ 84858AC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index ec7ea4968..582fd9cbc 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -11,5 +11,5 @@ NavelRock_Exterior: @ 8485874 .byte MAP_TYPE_INDOOR .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 8a145ad64..53c0fdaed 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -11,5 +11,5 @@ NavelRock_Fork: @ 84858E4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index f798d56df..79b1dbafb 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -11,5 +11,5 @@ NavelRock_Harbor: @ 8485890 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 43b9d951d..9c0a7b1c0 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -11,5 +11,5 @@ NavelRock_Top: @ 8485970 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index c409781be..3fa05854e 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -11,5 +11,5 @@ NavelRock_Up1: @ 8485900 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index a2f627a1c..62fed7dc3 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -11,5 +11,5 @@ NavelRock_Up2: @ 848591C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index bce8a899f..723329d92 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -11,5 +11,5 @@ NavelRock_Up3: @ 8485938 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 02a05c79e..33501a678 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -11,5 +11,5 @@ NavelRock_Up4: @ 8485954 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 706a21563..092cf841f 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -11,5 +11,5 @@ NewMauville_Entrance: @ 8484470 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index a3740f48a..3f8d3192e 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -11,5 +11,5 @@ NewMauville_Inside: @ 848448C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 074c45320..8d94687a6 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -11,5 +11,5 @@ OldaleTown: @ 84825D0 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index f188a6559..934cb22b0 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -11,5 +11,5 @@ OldaleTown_House1: @ 8482B80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 6e942e50c..55a6fd8a3 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -11,5 +11,5 @@ OldaleTown_House2: @ 8482B9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index bbc85e7cb..4727f0da9 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -11,5 +11,5 @@ OldaleTown_Mart: @ 8482BF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 3f01beee4..cdd572a95 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 99356ce57..24cf90aab 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 34c15d53f..5b572682b 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -11,5 +11,5 @@ PacifidlogTown: @ 848265C .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 33449542f..511692df1 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House1: @ 8482F8C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index c095f6827..04d685323 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House2: @ 8482FA8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 5aa498141..48f461797 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House3: @ 8482FC4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 9530591f6..a1edad163 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House4: @ 8482FE0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 915d053cb..850b4864b 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_House5: @ 8482FFC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 15b0044c3..b30133654 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 72331ab8d..db6f8b3df 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 2b8520a7b..4dae59652 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -11,5 +11,5 @@ PetalburgCity: @ 84824B8 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index b6604647f..e32063894 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -11,5 +11,5 @@ PetalburgCity_Gym: @ 8483034 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index c80452182..85bc3e460 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -11,5 +11,5 @@ PetalburgCity_House1: @ 8483050 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 61b9b16ca..f7f16748f 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -11,5 +11,5 @@ PetalburgCity_House2: @ 848306C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 92cabd5a3..624c8b6a1 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -11,5 +11,5 @@ PetalburgCity_Mart: @ 84830C0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 1a3e764bb..2a05feb29 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 73dbb7aa4..473e3c736 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 033e19488..91ee3622b 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -11,5 +11,5 @@ PetalburgCity_WallysHouse: @ 8483018 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 387032076..94b5bdfd1 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -11,5 +11,5 @@ PetalburgWoods: @ 8483FF4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 98573d9a4..9029f306f 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -11,5 +11,5 @@ RecordCorner: @ 8484D68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index feb3aa440..64836245f 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -11,5 +11,5 @@ Route101: @ 8482678 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 6102e69a0..dc2b3240a 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -11,5 +11,5 @@ Route102: @ 8482694 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 6c99d4df2..c7510701e 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -11,5 +11,5 @@ Route103: @ 84826B0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 1c09ae166..df6f0d34a 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -11,5 +11,5 @@ Route104: @ 84826CC .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 5dab30f42..139efeb74 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -11,5 +11,5 @@ Route104_MrBrineysHouse: @ 8483D70 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index f1f273c73..cd34cd3f4 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -11,5 +11,5 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 99284e566..ea0b1390a 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -11,5 +11,5 @@ Route104_Prototype: @ 8485AF8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 4bb9351d8..fce17ef00 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -11,5 +11,5 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .byte MAP_TYPE_INDOOR .2byte 0 .byte 8 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 040e26110..59ea4f3df 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -11,5 +11,5 @@ Route105: @ 84826E8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 69ab66b03..9292cae39 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -11,5 +11,5 @@ Route106: @ 8482704 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 399096d16..e038ea705 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -11,5 +11,5 @@ Route107: @ 8482720 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index a59ddf761..a6314172f 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -11,5 +11,5 @@ Route108: @ 848273C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 2262cadfa..489ea8789 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -11,5 +11,5 @@ Route109: @ 8482758 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 93deeb8a9..1f6f067ca 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -11,5 +11,5 @@ Route109_SeashoreHouse: @ 8485B30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index dd66f9f3d..c1dd03789 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -11,5 +11,5 @@ Route110: @ 8482774 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 0a5259894..d98361dd3 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -11,5 +11,5 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index a36613213..24baeb042 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -11,5 +11,5 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index af28f5ed0..9d9cf23ed 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -11,5 +11,5 @@ Route110_TrickHouseCorridor: @ 8485B84 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 9b0436a68..3ea5a8eb8 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -11,5 +11,5 @@ Route110_TrickHouseEnd: @ 8485B68 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index f86f11b92..8e202e650 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -11,5 +11,5 @@ Route110_TrickHouseEntrance: @ 8485B4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index cdb272aa7..593b807ce 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 946da22a8..e632dbca9 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle2: @ 8485BBC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 0686eef43..77e2e4a38 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 05bde230f..9ad6159f3 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index de723c302..910638d82 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle5: @ 8485C10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index e5a2864de..ab6c752cb 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle6: @ 8485C2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 5b884a138..68a7098fb 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle7: @ 8485C48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index def3cab3d..a330e3c1f 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -11,5 +11,5 @@ Route110_TrickHousePuzzle8: @ 8485C64 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 3ae44b79a..449498ed4 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -11,5 +11,5 @@ Route111: @ 8482790 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index b58e0f3df..70bbe3777 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -11,5 +11,5 @@ Route111_OldLadysRestStop: @ 8483DC4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 43ce6de6d..dea0352e6 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -11,5 +11,5 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 040d0d084..5961e48c2 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -11,5 +11,5 @@ Route112: @ 84827AC .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 05b88a15b..8e1dbc807 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -11,5 +11,5 @@ Route112_CableCarStation: @ 8483DE0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 7cd391478..e1b082712 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -11,5 +11,5 @@ Route113: @ 84827C8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 3cbad800b..9f31f510f 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -11,5 +11,5 @@ Route113_GlassWorkshop: @ 8485CB8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index 99cda55b5..c0920ada9 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -11,5 +11,5 @@ Route114: @ 84827E4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 43749207d..a1ad307e4 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -11,5 +11,5 @@ Route114_FossilManiacsHouse: @ 8483E18 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index 4892f1077..250695671 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -11,5 +11,5 @@ Route114_FossilManiacsTunnel: @ 8483E34 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 2b6ef1e78..8ba9dd58c 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -11,5 +11,5 @@ Route114_LanettesHouse: @ 8483E50 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 4490ad646..5da7c8990 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -11,5 +11,5 @@ Route115: @ 8482800 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 675ba4568..d0f4bfedf 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -11,5 +11,5 @@ Route116: @ 848281C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index d18ac8e84..ce7de5c71 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -11,5 +11,5 @@ Route116_TunnelersRestHouse: @ 8483E6C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 70104035a..c720839de 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -11,5 +11,5 @@ Route117: @ 8482838 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 72ba07c3a..d8fb67ce9 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -11,5 +11,5 @@ Route117_PokemonDayCare: @ 8483E88 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index ca2da8524..826281c09 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -11,5 +11,5 @@ Route118: @ 8482854 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 9e37cfdf4..cb9b211d9 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -11,5 +11,5 @@ Route119: @ 8482870 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 50eb5482b..e06dc3147 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -11,5 +11,5 @@ Route119_House: @ 8485D28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index f5a73c34c..ce15e7ea7 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -11,5 +11,5 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index effe5f066..eb8d25cd0 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -11,5 +11,5 @@ Route119_WeatherInstitute_2F: @ 8485D0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 767568015..a3b062bca 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -11,5 +11,5 @@ Route120: @ 848288C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 6a106d24d..5f744afaf 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -11,5 +11,5 @@ Route121: @ 84828A8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 665eacd57..3617aa5b0 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -11,5 +11,5 @@ Route121_SafariZoneEntrance: @ 8483EA4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index e2554ed2a..7e6dc55c2 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -11,5 +11,5 @@ Route122: @ 84828C4 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 5b662b8f5..9eba6be87 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -11,5 +11,5 @@ Route123: @ 84828E0 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 7ae6169d6..009b6fa98 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -11,5 +11,5 @@ Route123_BerryMastersHouse: @ 8485CD4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 217befb9c..43aab1b68 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -11,5 +11,5 @@ Route124: @ 84828FC .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 74d666591..777edeff2 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -11,5 +11,5 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index f093b492c..8cf6f8531 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -11,5 +11,5 @@ Route125: @ 8482918 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index dd713fc55..3e489dffd 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -11,5 +11,5 @@ Route126: @ 8482934 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index 76ebe06c3..950e11df7 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -11,5 +11,5 @@ Route127: @ 8482950 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 5de5e3d91..6065e257c 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -11,5 +11,5 @@ Route128: @ 848296C .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 936c951be..1bc9ac5f0 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -11,5 +11,5 @@ Route129: @ 8482988 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 99d1b8aa3..bff8b4e40 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -11,5 +11,5 @@ Route130: @ 84829A4 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index cf3b18e0b..3e6bf34b3 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -11,5 +11,5 @@ Route131: @ 84829C0 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 46587bf7d..4e292a92b 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -11,5 +11,5 @@ Route132: @ 84829DC .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 9f1aad37d..26428b3dc 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -11,5 +11,5 @@ Route133: @ 84829F8 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index cdd43da73..d1df504ed 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -11,5 +11,5 @@ Route134: @ 8482A14 .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index c0edf38c9..6e7bb70d4 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -11,5 +11,5 @@ RustboroCity: @ 848250C .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 26b4cc1ff..40742887b 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -11,5 +11,5 @@ RustboroCity_CuttersHouse: @ 8483478 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 855ceb419..d86b8537c 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -11,5 +11,5 @@ RustboroCity_DevonCorp_1F: @ 8483344 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 0200f56d2..b0da75514 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -11,5 +11,5 @@ RustboroCity_DevonCorp_2F: @ 8483360 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index e212f3dcc..21a33d5b8 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -11,5 +11,5 @@ RustboroCity_DevonCorp_3F: @ 848337C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index e861278db..b2a4da317 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat1_1F: @ 8483424 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 960813992..5a9a5a133 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat1_2F: @ 8483440 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 1c048f61c..8df565936 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat2_1F: @ 84834B0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 326a374f5..92161bb4d 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat2_2F: @ 84834CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index a9914830c..fafca84e7 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -11,5 +11,5 @@ RustboroCity_Flat2_3F: @ 84834E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index a31aeeb8b..8c07e3637 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -11,5 +11,5 @@ RustboroCity_Gym: @ 8483398 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 9ee33359f..94ae5e1e4 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -11,5 +11,5 @@ RustboroCity_House1: @ 848345C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index f96697756..51a6f7984 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -11,5 +11,5 @@ RustboroCity_House2: @ 8483494 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index aa479cb3f..89e62cf50 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -11,5 +11,5 @@ RustboroCity_House3: @ 8483504 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 046285567..766c1cb0c 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -11,5 +11,5 @@ RustboroCity_Mart: @ 8483408 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index ca5fc513d..17f717230 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 7c2467234..e7a1999cc 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 4c7ca3897..909e85c69 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -11,5 +11,5 @@ RustboroCity_PokemonSchool: @ 84833B4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 6bf405b3b..4dc4e2797 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -11,5 +11,5 @@ RusturfTunnel: @ 8483F30 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 1d892094c..9c1f2bab2 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -11,5 +11,5 @@ SSTidalCorridor: @ 8484F0C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 1e2c5b58d..6db9d2415 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -11,5 +11,5 @@ SSTidalLowerDeck: @ 8484F28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 6f2facdcd..a5788a49f 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -11,5 +11,5 @@ SSTidalRooms: @ 8484F44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index cbf7fae30..3e667fafc 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -11,5 +11,5 @@ SafariZone_North: @ 8485158 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 5630e462a..734254611 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -11,5 +11,5 @@ SafariZone_Northeast: @ 848528C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 526111c90..786316fcd 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -11,5 +11,5 @@ SafariZone_Northwest: @ 848513C .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 87e506ac1..1f02725b0 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -11,5 +11,5 @@ SafariZone_RestHouse: @ 8485270 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 160cfea7d..5c60a541b 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -11,5 +11,5 @@ SafariZone_South: @ 8485190 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index f87a4db6a..54f2c505a 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -11,5 +11,5 @@ SafariZone_Southeast: @ 84852A8 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 28bd8c761..332d2f9a4 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -11,5 +11,5 @@ SafariZone_Southwest: @ 8485174 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index eb61455fa..1de3fd413 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -11,5 +11,5 @@ ScorchedSlab: @ 84846BC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index dc62eba0c..417467ac5 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Entrance: @ 84841B4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index dd0a2db3c..e259b065b 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room1: @ 84841D0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 09be291c2..6331b3b18 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room2: @ 84841EC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index ff514a631..a91ef42ef 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room3: @ 8484208 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 130f198aa..7385a41fb 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room4: @ 8484224 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 594520629..aa2b0dc56 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room5: @ 8484240 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 24c8fde98..2f76c9b8f 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room6: @ 848425C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index b2c247ab9..3640bb597 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room7: @ 8484278 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 6bab8f16b..66e6523f0 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room8: @ 8484294 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index b50127ffc..2f08ec83a 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -11,5 +11,5 @@ SeafloorCavern_Room9: @ 84842B0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index f61e4d1f9..541842c26 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -11,5 +11,5 @@ SealedChamber_InnerRoom: @ 84846A0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index dd214cba6..5fa6728d8 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -11,5 +11,5 @@ SealedChamber_OuterRoom: @ 8484684 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index bfce09669..f75acd84a 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -11,5 +11,5 @@ SecretBase_BlueCave1: @ 8484AC8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 33555b1b1..6b80b45bb 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -11,5 +11,5 @@ SecretBase_BlueCave2: @ 8484B70 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 0f48e009d..19a4afdfd 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -11,5 +11,5 @@ SecretBase_BlueCave3: @ 8484C18 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index c43be047e..3a51deec4 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -11,5 +11,5 @@ SecretBase_BlueCave4: @ 8484CC0 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index b423185f2..7a79eab3e 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -11,5 +11,5 @@ SecretBase_BrownCave1: @ 8484AAC .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index e51a43f13..5f0e61f8c 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -11,5 +11,5 @@ SecretBase_BrownCave2: @ 8484B54 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 5b9fe83e4..bd88bf1d3 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -11,5 +11,5 @@ SecretBase_BrownCave3: @ 8484BFC .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index fc821510f..8183eee67 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -11,5 +11,5 @@ SecretBase_BrownCave4: @ 8484CA4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 2bb11dac2..774e8471e 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -11,5 +11,5 @@ SecretBase_RedCave1: @ 8484A90 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index f0e5d976a..2137748af 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -11,5 +11,5 @@ SecretBase_RedCave2: @ 8484B38 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index b62553c88..04b0ae23a 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -11,5 +11,5 @@ SecretBase_RedCave3: @ 8484BE0 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 1b7a86f06..94c8605a0 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -11,5 +11,5 @@ SecretBase_RedCave4: @ 8484C88 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 604f32e19..85e94f158 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -11,5 +11,5 @@ SecretBase_Shrub1: @ 8484B1C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 2454dd2ad..7beeb3d8b 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -11,5 +11,5 @@ SecretBase_Shrub2: @ 8484BC4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 9a0f7e8d7..18b1f132a 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -11,5 +11,5 @@ SecretBase_Shrub3: @ 8484C6C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 4cfdf043b..72c5724f6 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -11,5 +11,5 @@ SecretBase_Shrub4: @ 8484D14 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index dc2c07918..a9a341696 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -11,5 +11,5 @@ SecretBase_Tree1: @ 8484B00 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 7a35c5466..86898ed15 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -11,5 +11,5 @@ SecretBase_Tree2: @ 8484BA8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index bffa571d5..6ef940796 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -11,5 +11,5 @@ SecretBase_Tree3: @ 8484C50 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 55f3f56f1..2a2523a07 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -11,5 +11,5 @@ SecretBase_Tree4: @ 8484CF8 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 69287b49f..d15eacc36 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -11,5 +11,5 @@ SecretBase_YellowCave1: @ 8484AE4 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 98b4739e0..a1afc748a 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -11,5 +11,5 @@ SecretBase_YellowCave2: @ 8484B8C .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 681dc7c43..798754531 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -11,5 +11,5 @@ SecretBase_YellowCave3: @ 8484C34 .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index edfe53d6e..89921f1d4 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -11,5 +11,5 @@ SecretBase_YellowCave4: @ 8484CDC .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 12 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 5d136baee..507ad7054 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 867de3f37..1d334424b 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 005e502ad..98614de64 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index df62a5cfb..05b77a442 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 9caf4d5c3..b1ab8a459 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 9b2a56e23..0c8380b79 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideLowerRoom: @ 848441C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 674ce7f6d..8a977c94e 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -11,5 +11,5 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index f89fe0450..fe4b69f96 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -11,5 +11,5 @@ SingleBattleColosseum: @ 8484D30 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 1358d164c..842ec79cd 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -11,5 +11,5 @@ SkyPillar_1F: @ 8484764 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index b861a2ab4..e018869b9 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -11,5 +11,5 @@ SkyPillar_2F: @ 8484780 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 68903b8a2..e3b2c3c40 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -11,5 +11,5 @@ SkyPillar_3F: @ 848479C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index f74d33ce8..23addaa76 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -11,5 +11,5 @@ SkyPillar_4F: @ 84847B8 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 40c2fbe72..46830945d 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -11,5 +11,5 @@ SkyPillar_5F: @ 84847F0 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 5ef569e65..bafe1880a 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -11,5 +11,5 @@ SkyPillar_Entrance: @ 848472C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index e61123f1c..5e7ff153c 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -11,5 +11,5 @@ SkyPillar_Outside: @ 8484748 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 919534fc2..d4afb6ad1 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -11,5 +11,5 @@ SkyPillar_Top: @ 848480C .byte MAP_TYPE_ROUTE .2byte 0 .byte 12 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index adbda2e3a..335a1a094 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -11,5 +11,5 @@ SlateportCity: @ 84824D4 .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index 3f5e5809a..0b6c6bd39 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -11,5 +11,5 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 6721bdef1..926a367ee 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -11,5 +11,5 @@ SlateportCity_BattleTentCorridor: @ 8483130 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 46b5d595e..d4689afde 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -11,5 +11,5 @@ SlateportCity_BattleTentLobby: @ 8483114 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 22b61d048..5a31901a3 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -11,5 +11,5 @@ SlateportCity_Harbor: @ 84831D8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index d61584a37..06e2689cd 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -11,5 +11,5 @@ SlateportCity_House1: @ 8483168 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 3e2e6434d..5612c6df0 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -11,5 +11,5 @@ SlateportCity_House2: @ 84831F4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 36c3dfb57..764b8e9b5 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -11,5 +11,5 @@ SlateportCity_Mart: @ 8483248 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index fa4366df6..40b265c1d 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -11,5 +11,5 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index dc3f5a245..857443db1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -11,5 +11,5 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index abafe50fd..0c4696d86 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 343c20512..8026aaf41 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ SlateportCity_PokemonCenter_2F: @ 848322C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index fcbe42d2c..90b17f14a 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -11,5 +11,5 @@ SlateportCity_PokemonFanClub: @ 8483184 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 1d054f587..48d184517 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -11,5 +11,5 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 9be63a0bb..b868e843a 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -11,5 +11,5 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index a7d0d04d5..e635b6f80 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -11,5 +11,5 @@ SootopolisCity: @ 848257C .byte MAP_TYPE_CITY .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index aaaeb85ed..8b5c93c0d 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_Gym_1F: @ 8483A28 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index f2e9e2b4d..84caedcf8 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_Gym_B1F: @ 8483A44 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index e72841363..0b4eae619 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House1: @ 8483AB4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 555c1c7a1..a0d8b4fb4 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House2: @ 8483AD0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index da684a632..015f6fe6c 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House3: @ 8483AEC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index badfcc201..21c8c9235 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House4: @ 8483B08 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index bf52a354f..60fa216ca 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House5: @ 8483B24 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 82decfbba..112aa8a6d 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House6: @ 8483B40 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 27afdc4ee..a01616419 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -11,5 +11,5 @@ SootopolisCity_House7: @ 8483B5C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 573b465ba..b89221bac 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -11,5 +11,5 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 66400ad1d..4bdd9ef8d 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -11,5 +11,5 @@ SootopolisCity_Mart: @ 8483A98 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index b9b717298..be2d37eb6 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index 0630ba749..6635dc3d7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index d50ba8f01..c66b725fd 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 380f346a6..3a2844f4e 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index f7498c070..f6153e13f 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -11,5 +11,5 @@ SouthernIsland_Exterior: @ 8485238 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index eb5e1d572..e674840cf 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -11,5 +11,5 @@ SouthernIsland_Interior: @ 8485254 .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index b84a1a071..b69a9b501 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -11,5 +11,5 @@ TerraCave_End: @ 8484A3C .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 14 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index 69f541f7c..88ef9d3ef 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -11,5 +11,5 @@ TerraCave_Entrance: @ 8484A20 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 497a3219d..947cdbde2 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -11,5 +11,5 @@ TradeCenter: @ 8484D4C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index fae6fccae..b21e67e69 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -11,5 +11,5 @@ TrainerHill_1F: @ 84857E8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index 7cb9d5e67..e2a02834e 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -11,5 +11,5 @@ TrainerHill_2F: @ 8485804 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index f9834ed5f..c7513cc96 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -11,5 +11,5 @@ TrainerHill_3F: @ 8485820 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 59c339112..f25ce4e97 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -11,5 +11,5 @@ TrainerHill_4F: @ 848583C .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index ca48bb823..0d4e95af3 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -11,5 +11,5 @@ TrainerHill_Elevator: @ 8485ADC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index 91b6cf345..8e8eb4b91 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -11,5 +11,5 @@ TrainerHill_Entrance: @ 84857CC .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index f70f69aa0..d4d431dc5 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -11,5 +11,5 @@ TrainerHill_Roof: @ 8485858 .byte MAP_TYPE_INDOOR .2byte 0 .byte 4 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index d62735bb8..bf5589117 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -11,5 +11,5 @@ Underwater1: @ 8482A30 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index bc71590ea..5bd5b037b 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -11,5 +11,5 @@ Underwater2: @ 8482A4C .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 83fbe6155..064a732a5 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -11,5 +11,5 @@ Underwater3: @ 8482A68 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 2f826994b..7752479de 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -11,5 +11,5 @@ Underwater4: @ 8482A84 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index 9cdd79bf7..dda2f54b1 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -11,5 +11,5 @@ Underwater5: @ 8482AA0 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 2da188f55..17769c331 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -11,5 +11,5 @@ Underwater6: @ 8482ABC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index d9e75b02b..f5bc3bfa3 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -11,5 +11,5 @@ Underwater7: @ 8482AD8 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index f8de0fb73..7232ba916 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -11,5 +11,5 @@ Underwater_MarineCave: @ 84849CC .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 42c890ef6..71332ec78 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -11,5 +11,5 @@ Underwater_Route134: @ 848464C .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 96c31fa88..bc2efc58e 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -11,5 +11,5 @@ Underwater_SeafloorCavern: @ 8484198 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index b2fa29ceb..0c6e94575 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -11,5 +11,5 @@ Underwater_SealedChamber: @ 8484668 .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 35d0891ad..c4f55b1ef 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -11,5 +11,5 @@ Underwater_SootopolisCity: @ 8483F4C .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index 436c39614..29608287d 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -11,5 +11,5 @@ UnionRoom: @ 8485120 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index cdeeb4207..3241622ac 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_29: @ 8484DBC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 5648f0715..c1188df54 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_30: @ 8484DD8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 6e87bdc75..68eb31bc6 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_31: @ 8484DF4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index d899a6e51..c8d16cd09 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_32: @ 8484E10 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index bd048756d..45f9543df 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_33: @ 8484E2C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 33b51a404..0b612b27c 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -11,5 +11,5 @@ UnknownMap_25_34: @ 8484E48 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 16a1a3e2a..e07566710 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -11,5 +11,5 @@ VerdanturfTown: @ 8482640 .byte MAP_TYPE_TOWN .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 8c70d2cba..30daf14ca 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index bcd2185ab..e75e2f003 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index fe779c062..5852d60f4 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 015f71d0c..dfb4b0d05 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 599b1f59a..7f223d09a 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_House: @ 8482F38 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 315a42e56..4846b25e3 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_Mart: @ 8482EAC .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 5d17e03b9..9ae2edb7f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 0f881653d..a2a5a929e 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 69eae1a16..1887b7880 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -11,5 +11,5 @@ VerdanturfTown_WandasHouse: @ 8482F00 .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 81e866d49..56b800a29 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -11,5 +11,5 @@ VictoryRoad_1F: @ 8484374 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index 341350a7a..6650653ef 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -11,5 +11,5 @@ VictoryRoad_B1F: @ 8484390 .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index cd3451af7..c89256b33 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -11,5 +11,5 @@ VictoryRoad_B2F: @ 84843AC .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 15 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL -- cgit v1.2.3 From bf0178238a179b298f465b64a4f23ff43db48fc9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 16 Jul 2018 20:47:30 +0200 Subject: Battle files - review changes --- include/battle.h | 8 ++-- include/battle_controllers.h | 2 +- include/constants/trainers.h | 6 +-- include/gba/io_reg.h | 2 + src/battle_ai_script_commands.c | 10 ++--- src/battle_controller_player.c | 4 +- src/battle_controller_player_partner.c | 4 +- src/battle_interface.c | 4 +- src/battle_message.c | 8 ++-- src/battle_script_commands.c | 8 ++-- src/battle_util.c | 80 +++++++++++++++++----------------- src/braille_puzzles.c | 20 +++++++-- src/pokemon.c | 21 +++++---- 13 files changed, 95 insertions(+), 82 deletions(-) diff --git a/include/battle.h b/include/battle.h index fba5fb460..3843bc5e6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -214,8 +214,8 @@ struct SpecialStatus { u8 statLowered:1; // 0x1 u8 lightningRodRedirected:1; // 0x2 - u8 restoredBankSprite: 1; // 0x4 - u8 intimidatedPoke:1; // 0x8 + u8 restoredBattlerSprite: 1; // 0x4 + u8 intimidatedMon:1; // 0x8 u8 traced:1; // 0x10 u8 flag20:1; u8 flag40:1; @@ -607,8 +607,8 @@ struct BattleScripting // rom_80A5C6C u8 GetBattlerSide(u8 battler); -u8 GetBattlerPosition(u8 bank); -u8 GetBattlerAtPosition(u8 bank); +u8 GetBattlerPosition(u8 battler); +u8 GetBattlerAtPosition(u8 battler); struct BattleSpriteInfo { diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 8ba45fad1..ff5a629af 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -81,7 +81,7 @@ enum #define INSTANT_HP_BAR_DROP 32767 // Special return values in gBattleBufferB from Battle Controller functions. -#define RET_VALUE_LEVELLED_UP 11 +#define RET_VALUE_LEVELED_UP 11 struct UnusedControllerStruct { diff --git a/include/constants/trainers.h b/include/constants/trainers.h index eb695e4ab..43ea6d0b6 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -862,9 +862,9 @@ // Special Trainer Ids. #define TRAINER_FRONTIER_BRAIN 1022 #define TRAINER_SECRET_BASE 1024 -#define TRAINER_LINK_OPPONENT 0x800 -#define TRAINER_OPPONENT_C00 0xC00 -#define TRAINER_STEVEN_PARTNER 0xC03 +#define TRAINER_LINK_OPPONENT 2048 +#define TRAINER_OPPONENT_C00 3072 +#define TRAINER_STEVEN_PARTNER 3075 #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 6498c6a99..01d8c311e 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -582,6 +582,7 @@ #define BLDCNT_TGT1_BG3 (1 << 3) #define BLDCNT_TGT1_OBJ (1 << 4) #define BLDCNT_TGT1_BD (1 << 5) +#define BLDCNT_TGT1_ALL (BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD) // Bits 6-7 select the special effect #define BLDCNT_EFFECT_NONE (0 << 6) // no special effect #define BLDCNT_EFFECT_BLEND (1 << 6) // 1st+2nd targets mixed (controlled by BLDALPHA) @@ -594,6 +595,7 @@ #define BLDCNT_TGT2_BG3 (1 << 11) #define BLDCNT_TGT2_OBJ (1 << 12) #define BLDCNT_TGT2_BD (1 << 13) +#define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) // BLDALPHA #define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index e82d22576..74247f8a2 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -352,7 +352,7 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves) if (gAbsentBattlerFlags & gBitTable[gBattlerTarget]) gBattlerTarget ^= BIT_FLANK; } - // There's only one choice in signle battles. + // There's only one choice in single battles. else { gBattlerTarget = sBattler_AI ^ BIT_SIDE; @@ -774,7 +774,7 @@ static void BattleAICmd_if_status(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gBattleMons[battlerId].status1 & status)) + if (gBattleMons[battlerId].status1 & status) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -846,7 +846,7 @@ static void BattleAICmd_if_status3(void) status = T1_READ_32(gAIScriptPtr + 2); - if ((gStatuses3[battlerId] & status)) + if (gStatuses3[battlerId] & status) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -883,7 +883,7 @@ static void BattleAICmd_if_side_affecting(void) side = GET_BATTLER_SIDE(battlerId); status = T1_READ_32(gAIScriptPtr + 2); - if ((gSideStatuses[side] & status)) + if (gSideStatuses[side] & status) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -1949,7 +1949,7 @@ static void BattleAICmd_if_curr_move_disabled_or_encored(void) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; - break;; + break; case 1: if (gDisableStructs[gActiveBattler].encoredMove == AI_THINKING_STRUCT->moveConsidered) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 843d241ce..6ab19e368 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1169,7 +1169,7 @@ static void Task_GiveExpToMon(u8 taskId) gainedExp -= nextLvlExp - currExp; savedActiveBattler = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); + BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp); gActiveBattler = savedActiveBattler; if (IsDoubleBattle() == TRUE @@ -1248,7 +1248,7 @@ static void sub_8059400(u8 taskId) gainedExp -= expOnNextLvl - currExp; savedActiveBattler = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); + BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp); gActiveBattler = savedActiveBattler; gTasks[taskId].func = Task_LaunchLvlUpAnim; } diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index cd3a94692..601b8dcc1 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -345,7 +345,7 @@ static void Task_GiveExpToMon(u8 taskId) gainedExp -= nextLvlExp - currExp; savedActiveBank = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); + BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp); gActiveBattler = savedActiveBank; if (IsDoubleBattle() == TRUE @@ -424,7 +424,7 @@ static void sub_81BB4E4(u8 taskId) gainedExp -= expOnNextLvl - currExp; savedActiveBank = gActiveBattler; gActiveBattler = battlerId; - BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp); + BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp); gActiveBattler = savedActiveBank; gTasks[taskId].func = sub_81BB628; } diff --git a/src/battle_interface.c b/src/battle_interface.c index a6032adc3..278edb6f4 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1710,8 +1710,8 @@ void Task_HidePartyStatusSummary(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) ballIconSpriteIds[i] = gTasks[taskId].tBallIconSpriteId(i); - SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); - SetGpuReg(REG_OFFSET_BLDALPHA, 0x10); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0)); gTasks[taskId].tData15 = 16; diff --git a/src/battle_message.c b/src/battle_message.c index 32097fd76..4f5190dec 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2940,19 +2940,19 @@ static void ChooseTypeOfMoveUsedString(u8* dst) void BattlePutTextOnWindow(const u8 *text, u8 windowId) { const struct BattleWindowText *textInfo = sBattleTextOnWindowsInfo[gBattleScripting.windowsType]; - bool32 toVram; + bool32 copyToVram; struct TextSubPrinter textSubPrinter; u8 speed; if (windowId & 0x80) { windowId &= ~(0x80); - toVram = FALSE; + copyToVram = FALSE; } else { FillWindowPixelBuffer(windowId, textInfo[windowId].fillValue); - toVram = TRUE; + copyToVram = TRUE; } textSubPrinter.current_text_offset = text; @@ -3005,7 +3005,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) AddTextPrinter(&textSubPrinter, speed, NULL); - if (toVram) + if (copyToVram) { PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index eb31c22dc..87244ff5a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3449,7 +3449,7 @@ static void atk23_getexp(void) if (gBattleControllerExecFlags == 0) { gActiveBattler = gBattleStruct->expGetterBattlerId; - if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELLED_UP) + if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELED_UP) { if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId) HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); @@ -4649,14 +4649,14 @@ static void atk49_moveend(void) BtlController_EmitSpriteInvisibility(0, FALSE); MarkBattlerForControllerExec(gActiveBattler); gStatuses3[gBattlerAttacker] &= ~(STATUS3_SEMI_INVULNERABLE); - gSpecialStatuses[gBattlerAttacker].restoredBankSprite = 1; + gSpecialStatuses[gBattlerAttacker].restoredBattlerSprite = 1; gBattleScripting.atk49_state++; return; } gBattleScripting.atk49_state++; break; case 10: // make target sprite visible - if (!gSpecialStatuses[gBattlerTarget].restoredBankSprite && gBattlerTarget < gBattlersCount + if (!gSpecialStatuses[gBattlerTarget].restoredBattlerSprite && gBattlerTarget < gBattlersCount && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)) { gActiveBattler = gBattlerTarget; @@ -6632,7 +6632,7 @@ static void atk76_various(void) gBattleCommunication[0] = 0; break; case VARIOUS_RESET_INTIMIDATE_TRACE_BITS: - gSpecialStatuses[gActiveBattler].intimidatedPoke = 0; + gSpecialStatuses[gActiveBattler].intimidatedMon = 0; gSpecialStatuses[gActiveBattler].traced = 0; break; case VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP: diff --git a/src/battle_util.c b/src/battle_util.c index 6e3fc3e7f..c739c648c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -470,11 +470,11 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move) { s32 i; u8 imprisionedMoves = 0; - u8 BattlerSide = GetBattlerSide(battlerId); + u8 battlerSide = GetBattlerSide(battlerId); for (i = 0; i < gBattlersCount; i++) { - if (BattlerSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS) + if (battlerSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS) { s32 j; for (j = 0; j < 4; j++) @@ -1840,10 +1840,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } break; case ABILITY_INTIMIDATE: - if (!(gSpecialStatuses[battler].intimidatedPoke)) + if (!(gSpecialStatuses[battler].intimidatedMon)) { gStatuses3[battler] |= STATUS3_INTIMIDATE_POKES; - gSpecialStatuses[battler].intimidatedPoke = 1; + gSpecialStatuses[battler].intimidatedMon = 1; } break; case ABILITY_FORECAST: @@ -2511,32 +2511,32 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) int i = 0; u8 effect = ITEM_NO_EFFECT; u8 changedPP = 0; - u8 BattlerHoldEffect, atkHoldEffect, defHoldEffect; - u8 BattlerQuality, atkQuality, defQuality; + u8 battlerHoldEffect, atkHoldEffect, defHoldEffect; + u8 battlerHoldEffectParam, atkHoldEffectParam, defHoldEffectParam; u16 atkItem, defItem; gLastUsedItem = gBattleMons[battlerId].item; if (gLastUsedItem == ITEM_ENIGMA_BERRY) { - BattlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; - BattlerQuality = gEnigmaBerries[battlerId].holdEffectParam; + battlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; + battlerHoldEffectParam = gEnigmaBerries[battlerId].holdEffectParam; } else { - BattlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - BattlerQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + battlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + battlerHoldEffectParam = ItemId_GetHoldEffectParam(gLastUsedItem); } atkItem = gBattleMons[gBattlerAttacker].item; if (atkItem == ITEM_ENIGMA_BERRY) { atkHoldEffect = gEnigmaBerries[gBattlerAttacker].holdEffect; - atkQuality = gEnigmaBerries[gBattlerAttacker].holdEffectParam; + atkHoldEffectParam = gEnigmaBerries[gBattlerAttacker].holdEffectParam; } else { atkHoldEffect = ItemId_GetHoldEffect(atkItem); - atkQuality = ItemId_GetHoldEffectParam(atkItem); + atkHoldEffectParam = ItemId_GetHoldEffectParam(atkItem); } // def variables are unused @@ -2544,18 +2544,18 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) if (defItem == ITEM_ENIGMA_BERRY) { defHoldEffect = gEnigmaBerries[gBattlerTarget].holdEffect; - defQuality = gEnigmaBerries[gBattlerTarget].holdEffectParam; + defHoldEffectParam = gEnigmaBerries[gBattlerTarget].holdEffectParam; } else { defHoldEffect = ItemId_GetHoldEffect(defItem); - defQuality = ItemId_GetHoldEffectParam(defItem); + defHoldEffectParam = ItemId_GetHoldEffectParam(defItem); } switch (caseID) { case ITEMEFFECT_ON_SWITCH_IN: - switch (BattlerHoldEffect) + switch (battlerHoldEffect) { case HOLD_EFFECT_DOUBLE_PRIZE: if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) @@ -2583,13 +2583,13 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case 1: if (gBattleMons[battlerId].hp) { - switch (BattlerHoldEffect) + switch (battlerHoldEffect) { case HOLD_EFFECT_RESTORE_HP: if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn) { - gBattleMoveDamage = BattlerQuality; - if (gBattleMons[battlerId].hp + BattlerQuality > gBattleMons[battlerId].maxHP) + gBattleMoveDamage = battlerHoldEffectParam; + if (gBattleMons[battlerId].hp + battlerHoldEffectParam > gBattleMons[battlerId].maxHP) gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp; gBattleMoveDamage *= -1; BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); @@ -2618,10 +2618,10 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) if (i != 4) { u8 maxPP = CalculatePPWithBonus(move, ppBonuses, i); - if (changedPP + BattlerQuality > maxPP) + if (changedPP + battlerHoldEffectParam > maxPP) changedPP = maxPP; else - changedPP = changedPP + BattlerQuality; + changedPP = changedPP + battlerHoldEffectParam; PREPARE_MOVE_BUFFER(gBattleTextBuff1, move); @@ -2660,7 +2660,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gBattleMoveDamage *= -1; BattleScriptExecute(BattleScript_ItemHealHP_End2); effect = ITEM_HP_CHANGE; - RecordItemEffectBattle(battlerId, BattlerHoldEffect); + RecordItemEffectBattle(battlerId, battlerHoldEffect); } break; // nice copy/paste there gamefreak, making a function for confuse berries was too much eh? @@ -2669,7 +2669,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SPICY); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2687,7 +2687,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_DRY); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2705,7 +2705,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SWEET); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2723,7 +2723,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_BITTER); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2741,7 +2741,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SOUR); - gBattleMoveDamage = gBattleMons[battlerId].maxHP / BattlerQuality; + gBattleMoveDamage = gBattleMons[battlerId].maxHP / battlerHoldEffectParam; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP) @@ -2756,7 +2756,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) break; // copy/paste again, smh case HOLD_EFFECT_ATTACK_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK); PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE); @@ -2770,7 +2770,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_DEFENSE_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_DEF); @@ -2783,7 +2783,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SPEED_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPEED); @@ -2796,7 +2796,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SP_ATTACK_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPATK); @@ -2809,7 +2809,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_SP_DEFENSE_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC) { PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPDEF); @@ -2822,7 +2822,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_CRITICAL_UP: - if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY)) + if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY)) { gBattleMons[battlerId].status2 |= STATUS2_FOCUS_ENERGY; BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2); @@ -2830,7 +2830,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case HOLD_EFFECT_RANDOM_STAT_UP: - if (!moveTurn && gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / BattlerQuality) + if (!moveTurn && gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam) { for (i = 0; i < 5; i++) { @@ -2996,15 +2996,15 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gLastUsedItem = gBattleMons[battlerId].item; if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY) { - BattlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; - BattlerQuality = gEnigmaBerries[battlerId].holdEffectParam; + battlerHoldEffect = gEnigmaBerries[battlerId].holdEffect; + battlerHoldEffectParam = gEnigmaBerries[battlerId].holdEffectParam; } else { - BattlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - BattlerQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + battlerHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + battlerHoldEffectParam = ItemId_GetHoldEffectParam(gLastUsedItem); } - switch (BattlerHoldEffect) + switch (battlerHoldEffect) { case HOLD_EFFECT_CURE_PAR: if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS) @@ -3146,7 +3146,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case HOLD_EFFECT_FLINCH: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED - && (Random() % 100) < atkQuality + && (Random() % 100) < atkHoldEffectParam && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED && gBattleMons[gBattlerTarget].hp) { @@ -3167,7 +3167,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gLastUsedItem = atkItem; gPotentialItemEffectBattler = gBattlerAttacker; gBattleScripting.battler = gBattlerAttacker; - gBattleMoveDamage = (gSpecialStatuses[gBattlerTarget].dmg / atkQuality) * -1; + gBattleMoveDamage = (gSpecialStatuses[gBattlerTarget].dmg / atkHoldEffectParam) * -1; if (gBattleMoveDamage == 0) gBattleMoveDamage = -1; gSpecialStatuses[gBattlerTarget].dmg = 0; diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 91fcf8c46..b7ed1f713 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -7,6 +7,7 @@ #include "task.h" #include "field_effect.h" #include "constants/flags.h" +#include "constants/maps.h" extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap extern void DrawWholeMapView(); // field_camera @@ -205,14 +206,25 @@ void SealedChamberShakingEffect(u8 taskId) // moved later in the function because it was rewritten. bool8 ShouldDoBrailleStrengthEffect(void) { - if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x06)) + if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) + && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(DESERT_RUINS) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(DESERT_RUINS)) { if (gSaveBlock1Ptr->pos.x == 6 && gSaveBlock1Ptr->pos.y == 23) - { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { + sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; + return TRUE; + } else if (gSaveBlock1Ptr->pos.x == 5 && gSaveBlock1Ptr->pos.y == 23) - { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { + sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; + return TRUE; + } else if (gSaveBlock1Ptr->pos.x == 7 && gSaveBlock1Ptr->pos.y == 23) - { sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; } + { + sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; + return TRUE; + } } return FALSE; diff --git a/src/pokemon.c b/src/pokemon.c index 5406cfee9..bb2959eda 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2265,7 +2265,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (attackerHoldEffect == sHoldEffectToType[i][0] && type == sHoldEffectToType[i][1]) { - if (type <= 8) + if (IS_MOVE_PHYSICAL(type)) attack = (attack * (attackerHoldEffectParam + 100)) / 100; else spAttack = (spAttack * (attackerHoldEffectParam + 100)) / 100; @@ -2293,9 +2293,9 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de spAttack /= 2; if (attacker->ability == ABILITY_HUSTLE) attack = (150 * attack) / 100; - if (attacker->ability == ABILITY_PLUS && AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_MINUS, 0, 0)) + if (attacker->ability == ABILITY_PLUS && ABILITY_ON_FIELD2(ABILITY_MINUS)) spAttack = (150 * spAttack) / 100; - if (attacker->ability == ABILITY_MINUS && AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_PLUS, 0, 0)) + if (attacker->ability == ABILITY_MINUS && ABILITY_ON_FIELD2(ABILITY_PLUS)) spAttack = (150 * spAttack) / 100; if (attacker->ability == ABILITY_GUTS && attacker->status1) attack = (150 * attack) / 100; @@ -2316,7 +2316,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (gBattleMoves[gCurrentMove].effect == EFFECT_EXPLOSION) defense /= 2; - if (type < TYPE_MYSTERY) // is physical + if (IS_MOVE_PHYSICAL(type) && type != TYPE_MYSTERY) { if (gCritMultiplier == 2) { @@ -2366,7 +2366,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (type == TYPE_MYSTERY) damage = 0; // is ??? type. does 0 damage. - if (type > TYPE_MYSTERY) // is special? + if (IS_MOVE_SPECIAL(type)) { if (gCritMultiplier == 2) { @@ -2406,8 +2406,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de damage /= 2; // are effects of weather negated with cloud nine or air lock - if (!AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_CLOUD_NINE, 0, 0) - && !AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_AIR_LOCK, 0, 0)) + if (WEATHER_HAS_EFFECT2) { if (gBattleWeather & WEATHER_RAIN_TEMPORARY) { @@ -4514,7 +4513,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) holdEffect = ItemId_GetHoldEffect(heldItem); if (holdEffect == HOLD_EFFECT_PREVENT_EVOLVE && type != 3) - return 0; + return SPECIES_NONE; switch (type) { @@ -4522,7 +4521,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) level = GetMonData(mon, MON_DATA_LEVEL, 0); friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, 0); - for (i = 0; i < 5; i++) + for (i = 0; i < EVOS_PER_MON; i++) { switch (gEvolutionTable[species][i].method) { @@ -4579,7 +4578,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) } break; case 1: - for (i = 0; i < 5; i++) + for (i = 0; i < EVOS_PER_MON; i++) { switch (gEvolutionTable[species][i].method) { @@ -4599,7 +4598,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) break; case 2: case 3: - for (i = 0; i < 5; i++) + for (i = 0; i < EVOS_PER_MON; i++) { if (gEvolutionTable[species][i].method == EVO_ITEM && gEvolutionTable[species][i].param == evolutionItem) -- cgit v1.2.3 From 118fa3afcee68deb3eeb2bc876a9afd02a45677c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 16 Jul 2018 22:00:27 +0200 Subject: IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL --- include/battle.h | 4 ++-- src/battle_script_commands.c | 6 +++--- src/pokemon.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/battle.h b/include/battle.h index 3843bc5e6..bd7ba4b35 100644 --- a/include/battle.h +++ b/include/battle.h @@ -555,8 +555,8 @@ struct BattleStruct typeArg = gBattleMoves[move].type; \ } -#define IS_MOVE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY) -#define IS_MOVE_SPECIAL(moveType)(moveType > TYPE_MYSTERY) +#define IS_TYPE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY) +#define IS_TYPE_SPECIAL(moveType)(moveType > TYPE_MYSTERY) #define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0)) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 87244ff5a..3af03a5e0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1173,7 +1173,7 @@ static void atk01_accuracycheck(void) calc = (calc * 130) / 100; // 1.3 compound eyes boost if (WEATHER_HAS_EFFECT && gBattleMons[gBattlerTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY) calc = (calc * 80) / 100; // 1.2 sand veil loss - if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && IS_MOVE_PHYSICAL(type)) + if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && IS_TYPE_PHYSICAL(type)) calc = (calc * 80) / 100; // 1.2 hustle loss if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) @@ -1945,7 +1945,7 @@ static void atk0C_datahpupdate(void) if (!gSpecialStatuses[gActiveBattler].dmg && !(gHitMarker & HITMARKER_x100000)) gSpecialStatuses[gActiveBattler].dmg = gHpDealt; - if (IS_MOVE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) + if (IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) { gProtectStructs[gActiveBattler].physicalDmg = gHpDealt; gSpecialStatuses[gActiveBattler].physicalDmg = gHpDealt; @@ -1960,7 +1960,7 @@ static void atk0C_datahpupdate(void) gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerTarget; } } - else if (!IS_MOVE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000)) + else if (!IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000)) { gProtectStructs[gActiveBattler].specialDmg = gHpDealt; gSpecialStatuses[gActiveBattler].specialDmg = gHpDealt; diff --git a/src/pokemon.c b/src/pokemon.c index bb2959eda..c572ee10e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2265,7 +2265,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (attackerHoldEffect == sHoldEffectToType[i][0] && type == sHoldEffectToType[i][1]) { - if (IS_MOVE_PHYSICAL(type)) + if (IS_TYPE_PHYSICAL(type)) attack = (attack * (attackerHoldEffectParam + 100)) / 100; else spAttack = (spAttack * (attackerHoldEffectParam + 100)) / 100; @@ -2316,7 +2316,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (gBattleMoves[gCurrentMove].effect == EFFECT_EXPLOSION) defense /= 2; - if (IS_MOVE_PHYSICAL(type) && type != TYPE_MYSTERY) + if (IS_TYPE_PHYSICAL(type)) { if (gCritMultiplier == 2) { @@ -2366,7 +2366,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (type == TYPE_MYSTERY) damage = 0; // is ??? type. does 0 damage. - if (IS_MOVE_SPECIAL(type)) + if (IS_TYPE_SPECIAL(type)) { if (gCritMultiplier == 2) { -- cgit v1.2.3 From c41b8123e3fce07cb64fb565c92cc33350c19da7 Mon Sep 17 00:00:00 2001 From: vblm12 Date: Fri, 20 Jul 2018 22:03:22 -0500 Subject: Move trainer defines to one place in opponent.h... ... to match pokeruby --- include/constants/opponents.h | 1712 +++++++++++++++++++++-------------------- include/constants/trainers.h | 858 +-------------------- 2 files changed, 858 insertions(+), 1712 deletions(-) diff --git a/include/constants/opponents.h b/include/constants/opponents.h index 680a63763..9f74baf67 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -1,860 +1,862 @@ #ifndef GUARD_CONSTANTS_OPPONENTS_H #define GUARD_CONSTANTS_OPPONENTS_H -#define OPPONENT_NONE 0 -#define OPPONENT_SAWYER_1 1 -#define OPPONENT_GRUNT_1 2 -#define OPPONENT_GRUNT_2 3 -#define OPPONENT_GRUNT_3 4 -#define OPPONENT_GRUNT_4 5 -#define OPPONENT_GRUNT_5 6 -#define OPPONENT_GRUNT_6 7 -#define OPPONENT_GRUNT_7 8 -#define OPPONENT_GABRIELLE_1 9 -#define OPPONENT_GRUNT_8 10 -#define OPPONENT_MARCEL 11 -#define OPPONENT_ALBERTO 12 -#define OPPONENT_ED 13 -#define OPPONENT_GRUNT_9 14 -#define OPPONENT_DECLAN 15 -#define OPPONENT_GRUNT_10 16 -#define OPPONENT_GRUNT_11 17 -#define OPPONENT_GRUNT_12 18 -#define OPPONENT_GRUNT_13 19 -#define OPPONENT_GRUNT_14 20 -#define OPPONENT_GRUNT_15 21 -#define OPPONENT_GRUNT_16 22 -#define OPPONENT_GRUNT_17 23 -#define OPPONENT_GRUNT_18 24 -#define OPPONENT_GRUNT_19 25 -#define OPPONENT_GRUNT_20 26 -#define OPPONENT_GRUNT_21 27 -#define OPPONENT_GRUNT_22 28 -#define OPPONENT_FREDRICK 29 -#define OPPONENT_MATT_1 30 -#define OPPONENT_ZANDER 31 -#define OPPONENT_SHELLY_1 32 -#define OPPONENT_SHELLY_2 33 -#define OPPONENT_ARCHIE 34 -#define OPPONENT_LEAH 35 -#define OPPONENT_DAISY 36 -#define OPPONENT_ROSE_1 37 -#define OPPONENT_FELIX 38 -#define OPPONENT_VIOLET 39 -#define OPPONENT_ROSE_2 40 -#define OPPONENT_ROSE_3 41 -#define OPPONENT_ROSE_4 42 -#define OPPONENT_ROSE_5 43 -#define OPPONENT_DUSTY_1 44 -#define OPPONENT_CHIP 45 -#define OPPONENT_FOSTER 46 -#define OPPONENT_DUSTY_2 47 -#define OPPONENT_DUSTY_3 48 -#define OPPONENT_DUSTY_4 49 -#define OPPONENT_DUSTY_5 50 -#define OPPONENT_GABBY_AND_TY_1 51 -#define OPPONENT_GABBY_AND_TY_2 52 -#define OPPONENT_GABBY_AND_TY_3 53 -#define OPPONENT_GABBY_AND_TY_4 54 -#define OPPONENT_GABBY_AND_TY_5 55 -#define OPPONENT_GABBY_AND_TY_6 56 -#define OPPONENT_LOLA_1 57 -#define OPPONENT_AUSTINA 58 -#define OPPONENT_GWEN 59 -#define OPPONENT_LOLA_2 60 -#define OPPONENT_LOLA_3 61 -#define OPPONENT_LOLA_4 62 -#define OPPONENT_LOLA_5 63 -#define OPPONENT_RICKY_1 64 -#define OPPONENT_SIMON 65 -#define OPPONENT_CHARLIE 66 -#define OPPONENT_RICKY_2 67 -#define OPPONENT_RICKY_3 68 -#define OPPONENT_RICKY_4 69 -#define OPPONENT_RICKY_5 70 -#define OPPONENT_RANDALL 71 -#define OPPONENT_PARKER 72 -#define OPPONENT_GEORGE 73 -#define OPPONENT_BERKE 74 -#define OPPONENT_BRAXTON 75 -#define OPPONENT_VINCENT 76 -#define OPPONENT_LEROY 77 -#define OPPONENT_WILTON_1 78 -#define OPPONENT_EDGAR 79 -#define OPPONENT_ALBERT 80 -#define OPPONENT_SAMUEL 81 -#define OPPONENT_VITO 82 -#define OPPONENT_OWEN 83 -#define OPPONENT_WILTON_2 84 -#define OPPONENT_WILTON_3 85 -#define OPPONENT_WILTON_4 86 -#define OPPONENT_WILTON_5 87 -#define OPPONENT_WARREN 88 -#define OPPONENT_MARY 89 -#define OPPONENT_ALEXIA 90 -#define OPPONENT_JODY 91 -#define OPPONENT_WENDY 92 -#define OPPONENT_KEIRA 93 -#define OPPONENT_BROOKE_1 94 -#define OPPONENT_JENNIFER 95 -#define OPPONENT_HOPE 96 -#define OPPONENT_SHANNON 97 -#define OPPONENT_MICHELLE 98 -#define OPPONENT_CAROLINE 99 -#define OPPONENT_JULIE 100 -#define OPPONENT_BROOKE_2 101 -#define OPPONENT_BROOKE_3 102 -#define OPPONENT_BROOKE_4 103 -#define OPPONENT_BROOKE_5 104 -#define OPPONENT_PATRICIA 105 -#define OPPONENT_KINDRA 106 -#define OPPONENT_TAMMY 107 -#define OPPONENT_VALERIE_1 108 -#define OPPONENT_TASHA 109 -#define OPPONENT_VALERIE_2 110 -#define OPPONENT_VALERIE_3 111 -#define OPPONENT_VALERIE_4 112 -#define OPPONENT_VALERIE_5 113 -#define OPPONENT_CINDY_1 114 -#define OPPONENT_DAPHNE 115 -#define OPPONENT_GRUNT_23 116 -#define OPPONENT_CINDY_2 117 -#define OPPONENT_BRIANNA 118 -#define OPPONENT_NAOMI 119 -#define OPPONENT_CINDY_3 120 -#define OPPONENT_CINDY_4 121 -#define OPPONENT_CINDY_5 122 -#define OPPONENT_CINDY_6 123 -#define OPPONENT_MELISSA 124 -#define OPPONENT_SHEILA 125 -#define OPPONENT_SHIRLEY 126 -#define OPPONENT_JESSICA_1 127 -#define OPPONENT_CONNIE 128 -#define OPPONENT_BRIDGET 129 -#define OPPONENT_OLIVIA 130 -#define OPPONENT_TIFFANY 131 -#define OPPONENT_JESSICA_2 132 -#define OPPONENT_JESSICA_3 133 -#define OPPONENT_JESSICA_4 134 -#define OPPONENT_JESSICA_5 135 -#define OPPONENT_WINSTON_1 136 -#define OPPONENT_MOLLIE 137 -#define OPPONENT_GARRET 138 -#define OPPONENT_WINSTON_2 139 -#define OPPONENT_WINSTON_3 140 -#define OPPONENT_WINSTON_4 141 -#define OPPONENT_WINSTON_5 142 -#define OPPONENT_STEVE_1 143 -#define OPPONENT_THALIA_1 144 -#define OPPONENT_MARK 145 -#define OPPONENT_GRUNT_24 146 -#define OPPONENT_STEVE_2 147 -#define OPPONENT_STEVE_3 148 -#define OPPONENT_STEVE_4 149 -#define OPPONENT_STEVE_5 150 -#define OPPONENT_LUIS 151 -#define OPPONENT_DOMINIK 152 -#define OPPONENT_DOUGLAS 153 -#define OPPONENT_DARRIN 154 -#define OPPONENT_TONY_1 155 -#define OPPONENT_JEROME 156 -#define OPPONENT_MATTHEW 157 -#define OPPONENT_DAVID 158 -#define OPPONENT_SPENCER 159 -#define OPPONENT_ROLAND 160 -#define OPPONENT_NOLEN 161 -#define OPPONENT_STAN 162 -#define OPPONENT_BARRY 163 -#define OPPONENT_DEAN 164 -#define OPPONENT_RODNEY 165 -#define OPPONENT_RICHARD 166 -#define OPPONENT_HERMAN 167 -#define OPPONENT_SANTIAGO 168 -#define OPPONENT_GILBERT 169 -#define OPPONENT_FRANKLIN 170 -#define OPPONENT_KEVIN 171 -#define OPPONENT_JACK 172 -#define OPPONENT_DUDLEY 173 -#define OPPONENT_CHAD 174 -#define OPPONENT_TONY_2 175 -#define OPPONENT_TONY_3 176 -#define OPPONENT_TONY_4 177 -#define OPPONENT_TONY_5 178 -#define OPPONENT_TAKAO 179 -#define OPPONENT_HITOSHI 180 -#define OPPONENT_KIYO 181 -#define OPPONENT_KOICHI 182 -#define OPPONENT_NOB_1 183 -#define OPPONENT_NOB_2 184 -#define OPPONENT_NOB_3 185 -#define OPPONENT_NOB_4 186 -#define OPPONENT_NOB_5 187 -#define OPPONENT_YUJI 188 -#define OPPONENT_DAISUKE 189 -#define OPPONENT_ATSUSHI 190 -#define OPPONENT_KIRK 191 -#define OPPONENT_GRUNT_25 192 -#define OPPONENT_GRUNT_26 193 -#define OPPONENT_SHAWN 194 -#define OPPONENT_FERNANDO_1 195 -#define OPPONENT_DALTON_1 196 -#define OPPONENT_DALTON_2 197 -#define OPPONENT_DALTON_3 198 -#define OPPONENT_DALTON_4 199 -#define OPPONENT_DALTON_5 200 -#define OPPONENT_COLE 201 -#define OPPONENT_JEFF 202 -#define OPPONENT_AXLE 203 -#define OPPONENT_JACE 204 -#define OPPONENT_KEEGAN 205 -#define OPPONENT_BERNIE_1 206 -#define OPPONENT_BERNIE_2 207 -#define OPPONENT_BERNIE_3 208 -#define OPPONENT_BERNIE_4 209 -#define OPPONENT_BERNIE_5 210 -#define OPPONENT_DREW 211 -#define OPPONENT_BEAU 212 -#define OPPONENT_LARRY 213 -#define OPPONENT_SHANE 214 -#define OPPONENT_JUSTIN 215 -#define OPPONENT_ETHAN_1 216 -#define OPPONENT_AUTUMN 217 -#define OPPONENT_TRAVIS 218 -#define OPPONENT_ETHAN_2 219 -#define OPPONENT_ETHAN_3 220 -#define OPPONENT_ETHAN_4 221 -#define OPPONENT_ETHAN_5 222 -#define OPPONENT_BRENT 223 -#define OPPONENT_DONALD 224 -#define OPPONENT_TAYLOR 225 -#define OPPONENT_JEFFREY_1 226 -#define OPPONENT_DEREK 227 -#define OPPONENT_JEFFREY_2 228 -#define OPPONENT_JEFFREY_3 229 -#define OPPONENT_JEFFREY_4 230 -#define OPPONENT_JEFFREY_5 231 -#define OPPONENT_EDWARD 232 -#define OPPONENT_PRESTON 233 -#define OPPONENT_VIRGIL 234 -#define OPPONENT_BLAKE 235 -#define OPPONENT_WILLIAM 236 -#define OPPONENT_JOSHUA 237 -#define OPPONENT_CAMERON_1 238 -#define OPPONENT_CAMERON_2 239 -#define OPPONENT_CAMERON_3 240 -#define OPPONENT_CAMERON_4 241 -#define OPPONENT_CAMERON_5 242 -#define OPPONENT_JACLYN 243 -#define OPPONENT_HANNAH 244 -#define OPPONENT_SAMANTHA 245 -#define OPPONENT_MAURA 246 -#define OPPONENT_KAYLA 247 -#define OPPONENT_ALEXIS 248 -#define OPPONENT_JACKI_1 249 -#define OPPONENT_JACKI_2 250 -#define OPPONENT_JACKI_3 251 -#define OPPONENT_JACKI_4 252 -#define OPPONENT_JACKI_5 253 -#define OPPONENT_WALTER_1 254 -#define OPPONENT_MICAH 255 -#define OPPONENT_THOMAS 256 -#define OPPONENT_WALTER_2 257 -#define OPPONENT_WALTER_3 258 -#define OPPONENT_WALTER_4 259 -#define OPPONENT_WALTER_5 260 -#define OPPONENT_SIDNEY 261 -#define OPPONENT_PHOEBE 262 -#define OPPONENT_GLACIA 263 -#define OPPONENT_DRAKE 264 -#define OPPONENT_ROXANNE_1 265 -#define OPPONENT_BRAWLY_1 266 -#define OPPONENT_WATTSON_1 267 -#define OPPONENT_FLANNERY_1 268 -#define OPPONENT_NORMAN_1 269 -#define OPPONENT_WINONA_1 270 -#define OPPONENT_TATE_AND_LIZA_1 271 -#define OPPONENT_JUAN_1 272 -#define OPPONENT_JERRY_1 273 -#define OPPONENT_TED 274 -#define OPPONENT_PAUL 275 -#define OPPONENT_JERRY_2 276 -#define OPPONENT_JERRY_3 277 -#define OPPONENT_JERRY_4 278 -#define OPPONENT_JERRY_5 279 -#define OPPONENT_KAREN_1 280 -#define OPPONENT_GEORGIA 281 -#define OPPONENT_KAREN_2 282 -#define OPPONENT_KAREN_3 283 -#define OPPONENT_KAREN_4 284 -#define OPPONENT_KAREN_5 285 -#define OPPONENT_KATE_AND_JOY 286 -#define OPPONENT_ANNA_AND_MEG_1 287 -#define OPPONENT_ANNA_AND_MEG_2 288 -#define OPPONENT_ANNA_AND_MEG_3 289 -#define OPPONENT_ANNA_AND_MEG_4 290 -#define OPPONENT_ANNA_AND_MEG_5 291 -#define OPPONENT_VICTOR 292 -#define OPPONENT_MIGUEL_1 293 -#define OPPONENT_COLTON 294 -#define OPPONENT_MIGUEL_2 295 -#define OPPONENT_MIGUEL_3 296 -#define OPPONENT_MIGUEL_4 297 -#define OPPONENT_MIGUEL_5 298 -#define OPPONENT_VICTORIA 299 -#define OPPONENT_VANESSA 300 -#define OPPONENT_BETHANY 301 -#define OPPONENT_ISABEL_1 302 -#define OPPONENT_ISABEL_2 303 -#define OPPONENT_ISABEL_3 304 -#define OPPONENT_ISABEL_4 305 -#define OPPONENT_ISABEL_5 306 -#define OPPONENT_TIMOTHY_1 307 -#define OPPONENT_TIMOTHY_2 308 -#define OPPONENT_TIMOTHY_3 309 -#define OPPONENT_TIMOTHY_4 310 -#define OPPONENT_TIMOTHY_5 311 -#define OPPONENT_VICKY 312 -#define OPPONENT_SHELBY_1 313 -#define OPPONENT_SHELBY_2 314 -#define OPPONENT_SHELBY_3 315 -#define OPPONENT_SHELBY_4 316 -#define OPPONENT_SHELBY_5 317 -#define OPPONENT_CALVIN_1 318 -#define OPPONENT_BILLY 319 -#define OPPONENT_JOSH 320 -#define OPPONENT_TOMMY 321 -#define OPPONENT_JOEY 322 -#define OPPONENT_BEN 323 -#define OPPONENT_QUINCY 324 -#define OPPONENT_KATELYNN 325 -#define OPPONENT_JAYLEN 326 -#define OPPONENT_DILLON 327 -#define OPPONENT_CALVIN_2 328 -#define OPPONENT_CALVIN_3 329 -#define OPPONENT_CALVIN_4 330 -#define OPPONENT_CALVIN_5 331 -#define OPPONENT_EDDIE 332 -#define OPPONENT_ALLEN 333 -#define OPPONENT_TIMMY 334 -#define OPPONENT_WALLACE 335 -#define OPPONENT_ANDREW 336 -#define OPPONENT_IVAN 337 -#define OPPONENT_CLAUDE 338 -#define OPPONENT_ELLIOT_1 339 -#define OPPONENT_NED 340 -#define OPPONENT_DALE 341 -#define OPPONENT_NOLAN 342 -#define OPPONENT_BARNY 343 -#define OPPONENT_WADE 344 -#define OPPONENT_CARTER 345 -#define OPPONENT_ELLIOT_2 346 -#define OPPONENT_ELLIOT_3 347 -#define OPPONENT_ELLIOT_4 348 -#define OPPONENT_ELLIOT_5 349 -#define OPPONENT_RONALD 350 -#define OPPONENT_JACOB 351 -#define OPPONENT_ANTHONY 352 -#define OPPONENT_BENJAMIN_1 353 -#define OPPONENT_BENJAMIN_2 354 -#define OPPONENT_BENJAMIN_3 355 -#define OPPONENT_BENJAMIN_4 356 -#define OPPONENT_BENJAMIN_5 357 -#define OPPONENT_ABIGAIL_1 358 -#define OPPONENT_JASMINE 359 -#define OPPONENT_ABIGAIL_2 360 -#define OPPONENT_ABIGAIL_3 361 -#define OPPONENT_ABIGAIL_4 362 -#define OPPONENT_ABIGAIL_5 363 -#define OPPONENT_DYLAN_1 364 -#define OPPONENT_DYLAN_2 365 -#define OPPONENT_DYLAN_3 366 -#define OPPONENT_DYLAN_4 367 -#define OPPONENT_DYLAN_5 368 -#define OPPONENT_MARIA_1 369 -#define OPPONENT_MARIA_2 370 -#define OPPONENT_MARIA_3 371 -#define OPPONENT_MARIA_4 372 -#define OPPONENT_MARIA_5 373 -#define OPPONENT_CAMDEN 374 -#define OPPONENT_DEMETRIUS 375 -#define OPPONENT_ISAIAH_1 376 -#define OPPONENT_PABLO_1 377 -#define OPPONENT_CHASE 378 -#define OPPONENT_ISAIAH_2 379 -#define OPPONENT_ISAIAH_3 380 -#define OPPONENT_ISAIAH_4 381 -#define OPPONENT_ISAIAH_5 382 -#define OPPONENT_ISOBEL 383 -#define OPPONENT_DONNY 384 -#define OPPONENT_TALIA 385 -#define OPPONENT_KATELYN_1 386 -#define OPPONENT_ALLISON 387 -#define OPPONENT_KATELYN_2 388 -#define OPPONENT_KATELYN_3 389 -#define OPPONENT_KATELYN_4 390 -#define OPPONENT_KATELYN_5 391 -#define OPPONENT_NICOLAS_1 392 -#define OPPONENT_NICOLAS_2 393 -#define OPPONENT_NICOLAS_3 394 -#define OPPONENT_NICOLAS_4 395 -#define OPPONENT_NICOLAS_5 396 -#define OPPONENT_AARON 397 -#define OPPONENT_PERRY 398 -#define OPPONENT_HUGH 399 -#define OPPONENT_PHIL 400 -#define OPPONENT_JARED 401 -#define OPPONENT_HUMBERTO 402 -#define OPPONENT_PRESLEY 403 -#define OPPONENT_EDWARDO 404 -#define OPPONENT_COLIN 405 -#define OPPONENT_ROBERT_1 406 -#define OPPONENT_BENNY 407 -#define OPPONENT_CHESTER 408 -#define OPPONENT_ROBERT_2 409 -#define OPPONENT_ROBERT_3 410 -#define OPPONENT_ROBERT_4 411 -#define OPPONENT_ROBERT_5 412 -#define OPPONENT_ALEX 413 -#define OPPONENT_BECK 414 -#define OPPONENT_YASU 415 -#define OPPONENT_TAKASHI 416 -#define OPPONENT_DIANNE 417 -#define OPPONENT_JANI 418 -#define OPPONENT_LAO_1 419 -#define OPPONENT_LUNG 420 -#define OPPONENT_LAO_2 421 -#define OPPONENT_LAO_3 422 -#define OPPONENT_LAO_4 423 -#define OPPONENT_LAO_5 424 -#define OPPONENT_JOCELYN 425 -#define OPPONENT_LAURA 426 -#define OPPONENT_CYNDY_1 427 -#define OPPONENT_CORA 428 -#define OPPONENT_PAULA 429 -#define OPPONENT_CYNDY_2 430 -#define OPPONENT_CYNDY_3 431 -#define OPPONENT_CYNDY_4 432 -#define OPPONENT_CYNDY_5 433 -#define OPPONENT_MADELINE_1 434 -#define OPPONENT_CLARISSA 435 -#define OPPONENT_ANGELICA 436 -#define OPPONENT_MADELINE_2 437 -#define OPPONENT_MADELINE_3 438 -#define OPPONENT_MADELINE_4 439 -#define OPPONENT_MADELINE_5 440 -#define OPPONENT_BEVERLY 441 -#define OPPONENT_IMANI 442 -#define OPPONENT_KYLA 443 -#define OPPONENT_DENISE 444 -#define OPPONENT_BETH 445 -#define OPPONENT_TARA 446 -#define OPPONENT_MISSY 447 -#define OPPONENT_ALICE 448 -#define OPPONENT_JENNY_1 449 -#define OPPONENT_GRACE 450 -#define OPPONENT_TANYA 451 -#define OPPONENT_SHARON 452 -#define OPPONENT_NIKKI 453 -#define OPPONENT_BRENDA 454 -#define OPPONENT_KATIE 455 -#define OPPONENT_SUSIE 456 -#define OPPONENT_KARA 457 -#define OPPONENT_DANA 458 -#define OPPONENT_SIENNA 459 -#define OPPONENT_DEBRA 460 -#define OPPONENT_LINDA 461 -#define OPPONENT_KAYLEE 462 -#define OPPONENT_LAUREL 463 -#define OPPONENT_CARLEE 464 -#define OPPONENT_JENNY_2 465 -#define OPPONENT_JENNY_3 466 -#define OPPONENT_JENNY_4 467 -#define OPPONENT_JENNY_5 468 -#define OPPONENT_HEIDI 469 -#define OPPONENT_BECKY 470 -#define OPPONENT_CAROL 471 -#define OPPONENT_NANCY 472 -#define OPPONENT_MARTHA 473 -#define OPPONENT_DIANA_1 474 -#define OPPONENT_CEDRIC 475 -#define OPPONENT_IRENE 476 -#define OPPONENT_DIANA_2 477 -#define OPPONENT_DIANA_3 478 -#define OPPONENT_DIANA_4 479 -#define OPPONENT_DIANA_5 480 -#define OPPONENT_AMY_AND_LIV_1 481 -#define OPPONENT_AMY_AND_LIV_2 482 -#define OPPONENT_GINA_AND_MIA_1 483 -#define OPPONENT_MIU_AND_YUKI 484 -#define OPPONENT_AMY_AND_LIV_3 485 -#define OPPONENT_GINA_AND_MIA_2 486 -#define OPPONENT_AMY_AND_LIV_4 487 -#define OPPONENT_AMY_AND_LIV_5 488 -#define OPPONENT_AMY_AND_LIV_6 489 -#define OPPONENT_HUEY 490 -#define OPPONENT_EDMOND 491 -#define OPPONENT_ERNEST_1 492 -#define OPPONENT_DWAYNE 493 -#define OPPONENT_PHILLIP 494 -#define OPPONENT_LEONARD 495 -#define OPPONENT_DUNCAN 496 -#define OPPONENT_ERNEST_2 497 -#define OPPONENT_ERNEST_3 498 -#define OPPONENT_ERNEST_4 499 -#define OPPONENT_ERNEST_5 500 -#define OPPONENT_ELI 501 -#define OPPONENT_ANNIKA 502 -#define OPPONENT_JAZMYN 503 -#define OPPONENT_JONAS 504 -#define OPPONENT_KAYLEY 505 -#define OPPONENT_AURON 506 -#define OPPONENT_KELVIN 507 -#define OPPONENT_MARLEY 508 -#define OPPONENT_REYNA 509 -#define OPPONENT_HUDSON 510 -#define OPPONENT_CONOR 511 -#define OPPONENT_EDWIN_1 512 -#define OPPONENT_HECTOR 513 -#define OPPONENT_TABITHA_1 514 -#define OPPONENT_EDWIN_2 515 -#define OPPONENT_EDWIN_3 516 -#define OPPONENT_EDWIN_4 517 -#define OPPONENT_EDWIN_5 518 -#define OPPONENT_WALLY_1 519 -#define OPPONENT_BRENDAN_1 520 -#define OPPONENT_BRENDAN_2 521 -#define OPPONENT_BRENDAN_3 522 -#define OPPONENT_BRENDAN_4 523 -#define OPPONENT_BRENDAN_5 524 -#define OPPONENT_BRENDAN_6 525 -#define OPPONENT_BRENDAN_7 526 -#define OPPONENT_BRENDAN_8 527 -#define OPPONENT_BRENDAN_9 528 -#define OPPONENT_MAY_1 529 -#define OPPONENT_MAY_2 530 -#define OPPONENT_MAY_3 531 -#define OPPONENT_MAY_4 532 -#define OPPONENT_MAY_5 533 -#define OPPONENT_MAY_6 534 -#define OPPONENT_MAY_7 535 -#define OPPONENT_MAY_8 536 -#define OPPONENT_MAY_9 537 -#define OPPONENT_ISAAC_1 538 -#define OPPONENT_DAVIS 539 -#define OPPONENT_MITCHELL 540 -#define OPPONENT_ISAAC_2 541 -#define OPPONENT_ISAAC_3 542 -#define OPPONENT_ISAAC_4 543 -#define OPPONENT_ISAAC_5 544 -#define OPPONENT_LYDIA_1 545 -#define OPPONENT_HALLE 546 -#define OPPONENT_GARRISON 547 -#define OPPONENT_LYDIA_2 548 -#define OPPONENT_LYDIA_3 549 -#define OPPONENT_LYDIA_4 550 -#define OPPONENT_LYDIA_5 551 -#define OPPONENT_JACKSON_1 552 -#define OPPONENT_LORENZO 553 -#define OPPONENT_SEBASTIAN 554 -#define OPPONENT_JACKSON_2 555 -#define OPPONENT_JACKSON_3 556 -#define OPPONENT_JACKSON_4 557 -#define OPPONENT_JACKSON_5 558 -#define OPPONENT_CATHERINE_1 559 -#define OPPONENT_JENNA 560 -#define OPPONENT_SOPHIA 561 -#define OPPONENT_CATHERINE_2 562 -#define OPPONENT_CATHERINE_3 563 -#define OPPONENT_CATHERINE_4 564 -#define OPPONENT_CATHERINE_5 565 -#define OPPONENT_JULIO 566 -#define OPPONENT_GRUNT_27 567 -#define OPPONENT_GRUNT_28 568 -#define OPPONENT_GRUNT_29 569 -#define OPPONENT_GRUNT_30 570 -#define OPPONENT_MARC 571 -#define OPPONENT_BRENDEN 572 -#define OPPONENT_LILITH 573 -#define OPPONENT_CRISTIAN 574 -#define OPPONENT_SYLVIA 575 -#define OPPONENT_LEONARDO 576 -#define OPPONENT_ATHENA 577 -#define OPPONENT_HARRISON 578 -#define OPPONENT_GRUNT_31 579 -#define OPPONENT_CLARENCE 580 -#define OPPONENT_TERRY 581 -#define OPPONENT_NATE 582 -#define OPPONENT_KATHLEEN 583 -#define OPPONENT_CLIFFORD 584 -#define OPPONENT_NICHOLAS 585 -#define OPPONENT_GRUNT_32 586 -#define OPPONENT_GRUNT_33 587 -#define OPPONENT_GRUNT_34 588 -#define OPPONENT_GRUNT_35 589 -#define OPPONENT_GRUNT_36 590 -#define OPPONENT_MACEY 591 -#define OPPONENT_BRENDAN_10 592 -#define OPPONENT_BRENDAN_11 593 -#define OPPONENT_PAXTON 594 -#define OPPONENT_ISABELLA 595 -#define OPPONENT_GRUNT_37 596 -#define OPPONENT_TABITHA_2 597 -#define OPPONENT_JONATHAN 598 -#define OPPONENT_BRENDAN_12 599 -#define OPPONENT_MAY_10 600 -#define OPPONENT_MAXIE_1 601 -#define OPPONENT_MAXIE_2 602 -#define OPPONENT_TIANA 603 -#define OPPONENT_HALEY_1 604 -#define OPPONENT_JANICE 605 -#define OPPONENT_VIVI 606 -#define OPPONENT_HALEY_2 607 -#define OPPONENT_HALEY_3 608 -#define OPPONENT_HALEY_4 609 -#define OPPONENT_HALEY_5 610 -#define OPPONENT_SALLY 611 -#define OPPONENT_ROBIN 612 -#define OPPONENT_ANDREA 613 -#define OPPONENT_CRISSY 614 -#define OPPONENT_RICK 615 -#define OPPONENT_LYLE 616 -#define OPPONENT_JOSE 617 -#define OPPONENT_DOUG 618 -#define OPPONENT_GREG 619 -#define OPPONENT_KENT 620 -#define OPPONENT_JAMES_1 621 -#define OPPONENT_JAMES_2 622 -#define OPPONENT_JAMES_3 623 -#define OPPONENT_JAMES_4 624 -#define OPPONENT_JAMES_5 625 -#define OPPONENT_BRICE 626 -#define OPPONENT_TRENT_1 627 -#define OPPONENT_LENNY 628 -#define OPPONENT_LUCAS_1 629 -#define OPPONENT_ALAN 630 -#define OPPONENT_CLARK 631 -#define OPPONENT_ERIC 632 -#define OPPONENT_LUCAS_2 633 -#define OPPONENT_MIKE_1 634 -#define OPPONENT_MIKE_2 635 -#define OPPONENT_TRENT_2 636 -#define OPPONENT_TRENT_3 637 -#define OPPONENT_TRENT_4 638 -#define OPPONENT_TRENT_5 639 -#define OPPONENT_DEZ_AND_LUKE 640 -#define OPPONENT_LEA_AND_JED 641 -#define OPPONENT_KIRA_AND_DAN_1 642 -#define OPPONENT_KIRA_AND_DAN_2 643 -#define OPPONENT_KIRA_AND_DAN_3 644 -#define OPPONENT_KIRA_AND_DAN_4 645 -#define OPPONENT_KIRA_AND_DAN_5 646 -#define OPPONENT_JOHANNA 647 -#define OPPONENT_GERALD 648 -#define OPPONENT_VIVIAN 649 -#define OPPONENT_DANIELLE 650 -#define OPPONENT_HIDEO 651 -#define OPPONENT_KEIGO 652 -#define OPPONENT_RILEY 653 -#define OPPONENT_FLINT 654 -#define OPPONENT_ASHLEY 655 -#define OPPONENT_WALLY_2 656 -#define OPPONENT_WALLY_3 657 -#define OPPONENT_WALLY_4 658 -#define OPPONENT_WALLY_5 659 -#define OPPONENT_WALLY_6 660 -#define OPPONENT_BRENDAN_13 661 -#define OPPONENT_BRENDAN_14 662 -#define OPPONENT_BRENDAN_15 663 -#define OPPONENT_MAY_11 664 -#define OPPONENT_MAY_12 665 -#define OPPONENT_MAY_13 666 -#define OPPONENT_JONAH 667 -#define OPPONENT_HENRY 668 -#define OPPONENT_ROGER 669 -#define OPPONENT_ALEXA 670 -#define OPPONENT_RUBEN 671 -#define OPPONENT_KOJI_1 672 -#define OPPONENT_WAYNE 673 -#define OPPONENT_AIDAN 674 -#define OPPONENT_REED 675 -#define OPPONENT_TISHA 676 -#define OPPONENT_TORI_AND_TIA 677 -#define OPPONENT_KIM_AND_IRIS 678 -#define OPPONENT_TYRA_AND_IVY 679 -#define OPPONENT_MEL_AND_PAUL 680 -#define OPPONENT_JOHN_AND_JAY_1 681 -#define OPPONENT_JOHN_AND_JAY_2 682 -#define OPPONENT_JOHN_AND_JAY_3 683 -#define OPPONENT_JOHN_AND_JAY_4 684 -#define OPPONENT_JOHN_AND_JAY_5 685 -#define OPPONENT_RELI_AND_IAN 686 -#define OPPONENT_LILA_AND_ROY_1 687 -#define OPPONENT_LILA_AND_ROY_2 688 -#define OPPONENT_LILA_AND_ROY_3 689 -#define OPPONENT_LILA_AND_ROY_4 690 -#define OPPONENT_LILA_AND_ROY_5 691 -#define OPPONENT_LISA_AND_RAY 692 -#define OPPONENT_CHRIS 693 -#define OPPONENT_DAWSON 694 -#define OPPONENT_SARAH 695 -#define OPPONENT_DARIAN 696 -#define OPPONENT_HAILEY 697 -#define OPPONENT_CHANDLER 698 -#define OPPONENT_KALEB 699 -#define OPPONENT_JOSEPH 700 -#define OPPONENT_ALYSSA 701 -#define OPPONENT_MARCOS 702 -#define OPPONENT_RHETT 703 -#define OPPONENT_TYRON 704 -#define OPPONENT_CELINA 705 -#define OPPONENT_BIANCA 706 -#define OPPONENT_HAYDEN 707 -#define OPPONENT_SOPHIE 708 -#define OPPONENT_COBY 709 -#define OPPONENT_LAWRENCE 710 -#define OPPONENT_WYATT 711 -#define OPPONENT_ANGELINA 712 -#define OPPONENT_KAI 713 -#define OPPONENT_CHARLOTTE 714 -#define OPPONENT_DEANDRE 715 -#define OPPONENT_GRUNT_38 716 -#define OPPONENT_GRUNT_39 717 -#define OPPONENT_GRUNT_40 718 -#define OPPONENT_GRUNT_41 719 -#define OPPONENT_GRUNT_42 720 -#define OPPONENT_GRUNT_43 721 -#define OPPONENT_GRUNT_44 722 -#define OPPONENT_GRUNT_45 723 -#define OPPONENT_GRUNT_46 724 -#define OPPONENT_GRUNT_47 725 -#define OPPONENT_GRUNT_48 726 -#define OPPONENT_GRUNT_49 727 -#define OPPONENT_GRUNT_50 728 -#define OPPONENT_GRUNT_51 729 -#define OPPONENT_GRUNT_52 730 -#define OPPONENT_GRUNT_53 731 -#define OPPONENT_TABITHA_3 732 -#define OPPONENT_DARCY 733 -#define OPPONENT_MAXIE_3 734 -#define OPPONENT_PETE 735 -#define OPPONENT_ISABELLE 736 -#define OPPONENT_ANDRES_1 737 -#define OPPONENT_JOSUE 738 -#define OPPONENT_CAMRON 739 -#define OPPONENT_CORY_1 740 -#define OPPONENT_CAROLINA 741 -#define OPPONENT_ELIJAH 742 -#define OPPONENT_CELIA 743 -#define OPPONENT_BRYAN 744 -#define OPPONENT_BRANDEN 745 -#define OPPONENT_BRYANT 746 -#define OPPONENT_SHAYLA 747 -#define OPPONENT_KYRA 748 -#define OPPONENT_JAIDEN 749 -#define OPPONENT_ALIX 750 -#define OPPONENT_HELENE 751 -#define OPPONENT_MARLENE 752 -#define OPPONENT_DEVAN 753 -#define OPPONENT_JOHNSON 754 -#define OPPONENT_MELINA 755 -#define OPPONENT_BRANDI 756 -#define OPPONENT_AISHA 757 -#define OPPONENT_MAKAYLA 758 -#define OPPONENT_FABIAN 759 -#define OPPONENT_DAYTON 760 -#define OPPONENT_RACHEL 761 -#define OPPONENT_LEONEL 762 -#define OPPONENT_CALLIE 763 -#define OPPONENT_CALE 764 -#define OPPONENT_MYLES 765 -#define OPPONENT_PAT 766 -#define OPPONENT_CRISTIN_1 767 -#define OPPONENT_MAY_14 768 -#define OPPONENT_MAY_15 769 -#define OPPONENT_ROXANNE_2 770 -#define OPPONENT_ROXANNE_3 771 -#define OPPONENT_ROXANNE_4 772 -#define OPPONENT_ROXANNE_5 773 -#define OPPONENT_BRAWLY_2 774 -#define OPPONENT_BRAWLY_3 775 -#define OPPONENT_BRAWLY_4 776 -#define OPPONENT_BRAWLY_5 777 -#define OPPONENT_WATTSON_2 778 -#define OPPONENT_WATTSON_3 779 -#define OPPONENT_WATTSON_4 780 -#define OPPONENT_WATTSON_5 781 -#define OPPONENT_FLANNERY_2 782 -#define OPPONENT_FLANNERY_3 783 -#define OPPONENT_FLANNERY_4 784 -#define OPPONENT_FLANNERY_5 785 -#define OPPONENT_NORMAN_2 786 -#define OPPONENT_NORMAN_3 787 -#define OPPONENT_NORMAN_4 788 -#define OPPONENT_NORMAN_5 789 -#define OPPONENT_WINONA_2 790 -#define OPPONENT_WINONA_3 791 -#define OPPONENT_WINONA_4 792 -#define OPPONENT_WINONA_5 793 -#define OPPONENT_TATE_AND_LIZA_2 794 -#define OPPONENT_TATE_AND_LIZA_3 795 -#define OPPONENT_TATE_AND_LIZA_4 796 -#define OPPONENT_TATE_AND_LIZA_5 797 -#define OPPONENT_JUAN_2 798 -#define OPPONENT_JUAN_3 799 -#define OPPONENT_JUAN_4 800 -#define OPPONENT_JUAN_5 801 -#define OPPONENT_ANGELO 802 -#define OPPONENT_DARIUS 803 -#define OPPONENT_STEVEN 804 -#define OPPONENT_ANABEL 805 -#define OPPONENT_TUCKER 806 -#define OPPONENT_SPENSER 807 -#define OPPONENT_GRETA 808 -#define OPPONENT_NOLAND 809 -#define OPPONENT_LUCY 810 -#define OPPONENT_BRANDON 811 -#define OPPONENT_ANDRES_2 812 -#define OPPONENT_ANDRES_3 813 -#define OPPONENT_ANDRES_4 814 -#define OPPONENT_ANDRES_5 815 -#define OPPONENT_CORY_2 816 -#define OPPONENT_CORY_3 817 -#define OPPONENT_CORY_4 818 -#define OPPONENT_CORY_5 819 -#define OPPONENT_PABLO_2 820 -#define OPPONENT_PABLO_3 821 -#define OPPONENT_PABLO_4 822 -#define OPPONENT_PABLO_5 823 -#define OPPONENT_KOJI_2 824 -#define OPPONENT_KOJI_3 825 -#define OPPONENT_KOJI_4 826 -#define OPPONENT_KOJI_5 827 -#define OPPONENT_CRISTIN_2 828 -#define OPPONENT_CRISTIN_3 829 -#define OPPONENT_CRISTIN_4 830 -#define OPPONENT_CRISTIN_5 831 -#define OPPONENT_FERNANDO_2 832 -#define OPPONENT_FERNANDO_3 833 -#define OPPONENT_FERNANDO_4 834 -#define OPPONENT_FERNANDO_5 835 -#define OPPONENT_SAWYER_2 836 -#define OPPONENT_SAWYER_3 837 -#define OPPONENT_SAWYER_4 838 -#define OPPONENT_SAWYER_5 839 -#define OPPONENT_GABRIELLE_2 840 -#define OPPONENT_GABRIELLE_3 841 -#define OPPONENT_GABRIELLE_4 842 -#define OPPONENT_GABRIELLE_5 843 -#define OPPONENT_THALIA_2 844 -#define OPPONENT_THALIA_3 845 -#define OPPONENT_THALIA_4 846 -#define OPPONENT_THALIA_5 847 -#define OPPONENT_MARIELA 848 -#define OPPONENT_ALVARO 848 -#define OPPONENT_EVERETT 850 -#define OPPONENT_RED 851 -#define OPPONENT_LEAF 852 -#define OPPONENT_BRENDAN_16 853 -#define OPPONENT_MAY_16 854 +#define TRAINER_NONE 0 +#define TRAINER_SAWYER_1 1 +#define TRAINER_GRUNT_1 2 +#define TRAINER_GRUNT_2 3 +#define TRAINER_GRUNT_3 4 +#define TRAINER_GRUNT_4 5 +#define TRAINER_GRUNT_5 6 +#define TRAINER_GRUNT_6 7 +#define TRAINER_GRUNT_7 8 +#define TRAINER_GABRIELLE_1 9 +#define TRAINER_GRUNT_8 10 +#define TRAINER_MARCEL 11 +#define TRAINER_ALBERTO 12 +#define TRAINER_ED 13 +#define TRAINER_GRUNT_9 14 +#define TRAINER_DECLAN 15 +#define TRAINER_GRUNT_10 16 +#define TRAINER_GRUNT_11 17 +#define TRAINER_GRUNT_12 18 +#define TRAINER_GRUNT_13 19 +#define TRAINER_GRUNT_14 20 +#define TRAINER_GRUNT_15 21 +#define TRAINER_GRUNT_16 22 +#define TRAINER_GRUNT_17 23 +#define TRAINER_GRUNT_18 24 +#define TRAINER_GRUNT_19 25 +#define TRAINER_GRUNT_20 26 +#define TRAINER_GRUNT_21 27 +#define TRAINER_GRUNT_22 28 +#define TRAINER_FREDRICK 29 +#define TRAINER_MATT 30 +#define TRAINER_ZANDER 31 +#define TRAINER_SHELLY_1 32 +#define TRAINER_SHELLY_2 33 +#define TRAINER_ARCHIE 34 +#define TRAINER_LEAH 35 +#define TRAINER_DAISY 36 +#define TRAINER_ROSE_1 37 +#define TRAINER_FELIX 38 +#define TRAINER_VIOLET 39 +#define TRAINER_ROSE_2 40 +#define TRAINER_ROSE_3 41 +#define TRAINER_ROSE_4 42 +#define TRAINER_ROSE_5 43 +#define TRAINER_DUSTY_1 44 +#define TRAINER_CHIP 45 +#define TRAINER_FOSTER 46 +#define TRAINER_DUSTY_2 47 +#define TRAINER_DUSTY_3 48 +#define TRAINER_DUSTY_4 49 +#define TRAINER_DUSTY_5 50 +#define TRAINER_GABBY_AND_TY_1 51 +#define TRAINER_GABBY_AND_TY_2 52 +#define TRAINER_GABBY_AND_TY_3 53 +#define TRAINER_GABBY_AND_TY_4 54 +#define TRAINER_GABBY_AND_TY_5 55 +#define TRAINER_GABBY_AND_TY_6 56 +#define TRAINER_LOLA_1 57 +#define TRAINER_AUSTINA 58 +#define TRAINER_GWEN 59 +#define TRAINER_LOLA_2 60 +#define TRAINER_LOLA_3 61 +#define TRAINER_LOLA_4 62 +#define TRAINER_LOLA_5 63 +#define TRAINER_RICKY_1 64 +#define TRAINER_SIMON 65 +#define TRAINER_CHARLIE 66 +#define TRAINER_RICKY_2 67 +#define TRAINER_RICKY_3 68 +#define TRAINER_RICKY_4 69 +#define TRAINER_RICKY_5 70 +#define TRAINER_RANDALL 71 +#define TRAINER_PARKER 72 +#define TRAINER_GEORGE 73 +#define TRAINER_BERKE 74 +#define TRAINER_BRAXTON 75 +#define TRAINER_VINCENT 76 +#define TRAINER_LEROY 77 +#define TRAINER_WILTON_1 78 +#define TRAINER_EDGAR 79 +#define TRAINER_ALBERT 80 +#define TRAINER_SAMUEL 81 +#define TRAINER_VITO 82 +#define TRAINER_OWEN 83 +#define TRAINER_WILTON_2 84 +#define TRAINER_WILTON_3 85 +#define TRAINER_WILTON_4 86 +#define TRAINER_WILTON_5 87 +#define TRAINER_WARREN 88 +#define TRAINER_MARY 89 +#define TRAINER_ALEXIA 90 +#define TRAINER_JODY 91 +#define TRAINER_WENDY 92 +#define TRAINER_KEIRA 93 +#define TRAINER_BROOKE_1 94 +#define TRAINER_JENNIFER 95 +#define TRAINER_HOPE 96 +#define TRAINER_SHANNON 97 +#define TRAINER_MICHELLE 98 +#define TRAINER_CAROLINE 99 +#define TRAINER_JULIE 100 +#define TRAINER_BROOKE_2 101 +#define TRAINER_BROOKE_3 102 +#define TRAINER_BROOKE_4 103 +#define TRAINER_BROOKE_5 104 +#define TRAINER_PATRICIA 105 +#define TRAINER_KINDRA 106 +#define TRAINER_TAMMY 107 +#define TRAINER_VALERIE_1 108 +#define TRAINER_TASHA 109 +#define TRAINER_VALERIE_2 110 +#define TRAINER_VALERIE_3 111 +#define TRAINER_VALERIE_4 112 +#define TRAINER_VALERIE_5 113 +#define TRAINER_CINDY_1 114 +#define TRAINER_DAPHNE 115 +#define TRAINER_GRUNT_23 116 +#define TRAINER_CINDY_2 117 +#define TRAINER_BRIANNA 118 +#define TRAINER_NAOMI 119 +#define TRAINER_CINDY_3 120 +#define TRAINER_CINDY_4 121 +#define TRAINER_CINDY_5 122 +#define TRAINER_CINDY_6 123 +#define TRAINER_MELISSA 124 +#define TRAINER_SHEILA 125 +#define TRAINER_SHIRLEY 126 +#define TRAINER_JESSICA_1 127 +#define TRAINER_CONNIE 128 +#define TRAINER_BRIDGET 129 +#define TRAINER_OLIVIA 130 +#define TRAINER_TIFFANY 131 +#define TRAINER_JESSICA_2 132 +#define TRAINER_JESSICA_3 133 +#define TRAINER_JESSICA_4 134 +#define TRAINER_JESSICA_5 135 +#define TRAINER_WINSTON_1 136 +#define TRAINER_MOLLIE 137 +#define TRAINER_GARRET 138 +#define TRAINER_WINSTON_2 139 +#define TRAINER_WINSTON_3 140 +#define TRAINER_WINSTON_4 141 +#define TRAINER_WINSTON_5 142 +#define TRAINER_STEVE_1 143 +#define TRAINER_THALIA_1 144 +#define TRAINER_MARK 145 +#define TRAINER_GRUNT_24 146 +#define TRAINER_STEVE_2 147 +#define TRAINER_STEVE_3 148 +#define TRAINER_STEVE_4 149 +#define TRAINER_STEVE_5 150 +#define TRAINER_LUIS 151 +#define TRAINER_DOMINIK 152 +#define TRAINER_DOUGLAS 153 +#define TRAINER_DARRIN 154 +#define TRAINER_TONY_1 155 +#define TRAINER_JEROME 156 +#define TRAINER_MATTHEW 157 +#define TRAINER_DAVID 158 +#define TRAINER_SPENCER 159 +#define TRAINER_ROLAND 160 +#define TRAINER_NOLEN 161 +#define TRAINER_STAN 162 +#define TRAINER_BARRY 163 +#define TRAINER_DEAN 164 +#define TRAINER_RODNEY 165 +#define TRAINER_RICHARD 166 +#define TRAINER_HERMAN 167 +#define TRAINER_SANTIAGO 168 +#define TRAINER_GILBERT 169 +#define TRAINER_FRANKLIN 170 +#define TRAINER_KEVIN 171 +#define TRAINER_JACK 172 +#define TRAINER_DUDLEY 173 +#define TRAINER_CHAD 174 +#define TRAINER_TONY_2 175 +#define TRAINER_TONY_3 176 +#define TRAINER_TONY_4 177 +#define TRAINER_TONY_5 178 +#define TRAINER_TAKAO 179 +#define TRAINER_HITOSHI 180 +#define TRAINER_KIYO 181 +#define TRAINER_KOICHI 182 +#define TRAINER_NOB_1 183 +#define TRAINER_NOB_2 184 +#define TRAINER_NOB_3 185 +#define TRAINER_NOB_4 186 +#define TRAINER_NOB_5 187 +#define TRAINER_YUJI 188 +#define TRAINER_DAISUKE 189 +#define TRAINER_ATSUSHI 190 +#define TRAINER_KIRK 191 +#define TRAINER_GRUNT_25 192 +#define TRAINER_GRUNT_26 193 +#define TRAINER_SHAWN 194 +#define TRAINER_FERNANDO_1 195 +#define TRAINER_DALTON_1 196 +#define TRAINER_DALTON_2 197 +#define TRAINER_DALTON_3 198 +#define TRAINER_DALTON_4 199 +#define TRAINER_DALTON_5 200 +#define TRAINER_COLE 201 +#define TRAINER_JEFF 202 +#define TRAINER_AXLE 203 +#define TRAINER_JACE 204 +#define TRAINER_KEEGAN 205 +#define TRAINER_BERNIE_1 206 +#define TRAINER_BERNIE_2 207 +#define TRAINER_BERNIE_3 208 +#define TRAINER_BERNIE_4 209 +#define TRAINER_BERNIE_5 210 +#define TRAINER_DREW 211 +#define TRAINER_BEAU 212 +#define TRAINER_LARRY 213 +#define TRAINER_SHANE 214 +#define TRAINER_JUSTIN 215 +#define TRAINER_ETHAN_1 216 +#define TRAINER_AUTUMN 217 +#define TRAINER_TRAVIS 218 +#define TRAINER_ETHAN_2 219 +#define TRAINER_ETHAN_3 220 +#define TRAINER_ETHAN_4 221 +#define TRAINER_ETHAN_5 222 +#define TRAINER_BRENT 223 +#define TRAINER_DONALD 224 +#define TRAINER_TAYLOR 225 +#define TRAINER_JEFFREY_1 226 +#define TRAINER_DEREK 227 +#define TRAINER_JEFFREY_2 228 +#define TRAINER_JEFFREY_3 229 +#define TRAINER_JEFFREY_4 230 +#define TRAINER_JEFFREY_5 231 +#define TRAINER_EDWARD 232 +#define TRAINER_PRESTON 233 +#define TRAINER_VIRGIL 234 +#define TRAINER_BLAKE 235 +#define TRAINER_WILLIAM 236 +#define TRAINER_JOSHUA 237 +#define TRAINER_CAMERON_1 238 +#define TRAINER_CAMERON_2 239 +#define TRAINER_CAMERON_3 240 +#define TRAINER_CAMERON_4 241 +#define TRAINER_CAMERON_5 242 +#define TRAINER_JACLYN 243 +#define TRAINER_HANNAH 244 +#define TRAINER_SAMANTHA 245 +#define TRAINER_MAURA 246 +#define TRAINER_KAYLA 247 +#define TRAINER_ALEXIS 248 +#define TRAINER_JACKI_1 249 +#define TRAINER_JACKI_2 250 +#define TRAINER_JACKI_3 251 +#define TRAINER_JACKI_4 252 +#define TRAINER_JACKI_5 253 +#define TRAINER_WALTER_1 254 +#define TRAINER_MICAH 255 +#define TRAINER_THOMAS 256 +#define TRAINER_WALTER_2 257 +#define TRAINER_WALTER_3 258 +#define TRAINER_WALTER_4 259 +#define TRAINER_WALTER_5 260 +#define TRAINER_SIDNEY 261 +#define TRAINER_PHOEBE 262 +#define TRAINER_GLACIA 263 +#define TRAINER_DRAKE 264 +#define TRAINER_ROXANNE_1 265 +#define TRAINER_BRAWLY_1 266 +#define TRAINER_WATTSON_1 267 +#define TRAINER_FLANNERY_1 268 +#define TRAINER_NORMAN_1 269 +#define TRAINER_WINONA_1 270 +#define TRAINER_TATE_AND_LIZA_1 271 +#define TRAINER_JUAN_1 272 +#define TRAINER_JERRY_1 273 +#define TRAINER_TED 274 +#define TRAINER_PAUL 275 +#define TRAINER_JERRY_2 276 +#define TRAINER_JERRY_3 277 +#define TRAINER_JERRY_4 278 +#define TRAINER_JERRY_5 279 +#define TRAINER_KAREN_1 280 +#define TRAINER_GEORGIA 281 +#define TRAINER_KAREN_2 282 +#define TRAINER_KAREN_3 283 +#define TRAINER_KAREN_4 284 +#define TRAINER_KAREN_5 285 +#define TRAINER_KATE_AND_JOY 286 +#define TRAINER_ANNA_AND_MEG_1 287 +#define TRAINER_ANNA_AND_MEG_2 288 +#define TRAINER_ANNA_AND_MEG_3 289 +#define TRAINER_ANNA_AND_MEG_4 290 +#define TRAINER_ANNA_AND_MEG_5 291 +#define TRAINER_VICTOR 292 +#define TRAINER_MIGUEL_1 293 +#define TRAINER_COLTON 294 +#define TRAINER_MIGUEL_2 295 +#define TRAINER_MIGUEL_3 296 +#define TRAINER_MIGUEL_4 297 +#define TRAINER_MIGUEL_5 298 +#define TRAINER_VICTORIA 299 +#define TRAINER_VANESSA 300 +#define TRAINER_BETHANY 301 +#define TRAINER_ISABEL_1 302 +#define TRAINER_ISABEL_2 303 +#define TRAINER_ISABEL_3 304 +#define TRAINER_ISABEL_4 305 +#define TRAINER_ISABEL_5 306 +#define TRAINER_TIMOTHY_1 307 +#define TRAINER_TIMOTHY_2 308 +#define TRAINER_TIMOTHY_3 309 +#define TRAINER_TIMOTHY_4 310 +#define TRAINER_TIMOTHY_5 311 +#define TRAINER_VICKY 312 +#define TRAINER_SHELBY_1 313 +#define TRAINER_SHELBY_2 314 +#define TRAINER_SHELBY_3 315 +#define TRAINER_SHELBY_4 316 +#define TRAINER_SHELBY_5 317 +#define TRAINER_CALVIN_1 318 +#define TRAINER_BILLY 319 +#define TRAINER_JOSH 320 +#define TRAINER_TOMMY 321 +#define TRAINER_JOEY 322 +#define TRAINER_BEN 323 +#define TRAINER_QUINCY 324 +#define TRAINER_KATELYNN 325 +#define TRAINER_JAYLEN 326 +#define TRAINER_DILLON 327 +#define TRAINER_CALVIN_2 328 +#define TRAINER_CALVIN_3 329 +#define TRAINER_CALVIN_4 330 +#define TRAINER_CALVIN_5 331 +#define TRAINER_EDDIE 332 +#define TRAINER_ALLEN 333 +#define TRAINER_TIMMY 334 +#define TRAINER_WALLACE 335 +#define TRAINER_ANDREW 336 +#define TRAINER_IVAN 337 +#define TRAINER_CLAUDE 338 +#define TRAINER_ELLIOT_1 339 +#define TRAINER_NED 340 +#define TRAINER_DALE 341 +#define TRAINER_NOLAN 342 +#define TRAINER_BARNY 343 +#define TRAINER_WADE 344 +#define TRAINER_CARTER 345 +#define TRAINER_ELLIOT_2 346 +#define TRAINER_ELLIOT_3 347 +#define TRAINER_ELLIOT_4 348 +#define TRAINER_ELLIOT_5 349 +#define TRAINER_RONALD 350 +#define TRAINER_JACOB 351 +#define TRAINER_ANTHONY 352 +#define TRAINER_BENJAMIN_1 353 +#define TRAINER_BENJAMIN_2 354 +#define TRAINER_BENJAMIN_3 355 +#define TRAINER_BENJAMIN_4 356 +#define TRAINER_BENJAMIN_5 357 +#define TRAINER_ABIGAIL_1 358 +#define TRAINER_JASMINE 359 +#define TRAINER_ABIGAIL_2 360 +#define TRAINER_ABIGAIL_3 361 +#define TRAINER_ABIGAIL_4 362 +#define TRAINER_ABIGAIL_5 363 +#define TRAINER_DYLAN_1 364 +#define TRAINER_DYLAN_2 365 +#define TRAINER_DYLAN_3 366 +#define TRAINER_DYLAN_4 367 +#define TRAINER_DYLAN_5 368 +#define TRAINER_MARIA_1 369 +#define TRAINER_MARIA_2 370 +#define TRAINER_MARIA_3 371 +#define TRAINER_MARIA_4 372 +#define TRAINER_MARIA_5 373 +#define TRAINER_CAMDEN 374 +#define TRAINER_DEMETRIUS 375 +#define TRAINER_ISAIAH_1 376 +#define TRAINER_PABLO_1 377 +#define TRAINER_CHASE 378 +#define TRAINER_ISAIAH_2 379 +#define TRAINER_ISAIAH_3 380 +#define TRAINER_ISAIAH_4 381 +#define TRAINER_ISAIAH_5 382 +#define TRAINER_ISOBEL 383 +#define TRAINER_DONNY 384 +#define TRAINER_TALIA 385 +#define TRAINER_KATELYN_1 386 +#define TRAINER_ALLISON 387 +#define TRAINER_KATELYN_2 388 +#define TRAINER_KATELYN_3 389 +#define TRAINER_KATELYN_4 390 +#define TRAINER_KATELYN_5 391 +#define TRAINER_NICOLAS_1 392 +#define TRAINER_NICOLAS_2 393 +#define TRAINER_NICOLAS_3 394 +#define TRAINER_NICOLAS_4 395 +#define TRAINER_NICOLAS_5 396 +#define TRAINER_AARON 397 +#define TRAINER_PERRY 398 +#define TRAINER_HUGH 399 +#define TRAINER_PHIL 400 +#define TRAINER_JARED 401 +#define TRAINER_HUMBERTO 402 +#define TRAINER_PRESLEY 403 +#define TRAINER_EDWARDO 404 +#define TRAINER_COLIN 405 +#define TRAINER_ROBERT_1 406 +#define TRAINER_BENNY 407 +#define TRAINER_CHESTER 408 +#define TRAINER_ROBERT_2 409 +#define TRAINER_ROBERT_3 410 +#define TRAINER_ROBERT_4 411 +#define TRAINER_ROBERT_5 412 +#define TRAINER_ALEX 413 +#define TRAINER_BECK 414 +#define TRAINER_YASU 415 +#define TRAINER_TAKASHI 416 +#define TRAINER_DIANNE 417 +#define TRAINER_JANI 418 +#define TRAINER_LAO_1 419 +#define TRAINER_LUNG 420 +#define TRAINER_LAO_2 421 +#define TRAINER_LAO_3 422 +#define TRAINER_LAO_4 423 +#define TRAINER_LAO_5 424 +#define TRAINER_JOCELYN 425 +#define TRAINER_LAURA 426 +#define TRAINER_CYNDY_1 427 +#define TRAINER_CORA 428 +#define TRAINER_PAULA 429 +#define TRAINER_CYNDY_2 430 +#define TRAINER_CYNDY_3 431 +#define TRAINER_CYNDY_4 432 +#define TRAINER_CYNDY_5 433 +#define TRAINER_MADELINE_1 434 +#define TRAINER_CLARISSA 435 +#define TRAINER_ANGELICA 436 +#define TRAINER_MADELINE_2 437 +#define TRAINER_MADELINE_3 438 +#define TRAINER_MADELINE_4 439 +#define TRAINER_MADELINE_5 440 +#define TRAINER_BEVERLY 441 +#define TRAINER_IMANI 442 +#define TRAINER_KYLA 443 +#define TRAINER_DENISE 444 +#define TRAINER_BETH 445 +#define TRAINER_TARA 446 +#define TRAINER_MISSY 447 +#define TRAINER_ALICE 448 +#define TRAINER_JENNY_1 449 +#define TRAINER_GRACE 450 +#define TRAINER_TANYA 451 +#define TRAINER_SHARON 452 +#define TRAINER_NIKKI 453 +#define TRAINER_BRENDA 454 +#define TRAINER_KATIE 455 +#define TRAINER_SUSIE 456 +#define TRAINER_KARA 457 +#define TRAINER_DANA 458 +#define TRAINER_SIENNA 459 +#define TRAINER_DEBRA 460 +#define TRAINER_LINDA 461 +#define TRAINER_KAYLEE 462 +#define TRAINER_LAUREL 463 +#define TRAINER_CARLEE 464 +#define TRAINER_JENNY_2 465 +#define TRAINER_JENNY_3 466 +#define TRAINER_JENNY_4 467 +#define TRAINER_JENNY_5 468 +#define TRAINER_HEIDI 469 +#define TRAINER_BECKY 470 +#define TRAINER_CAROL 471 +#define TRAINER_NANCY 472 +#define TRAINER_MARTHA 473 +#define TRAINER_DIANA_1 474 +#define TRAINER_CEDRIC 475 +#define TRAINER_IRENE 476 +#define TRAINER_DIANA_2 477 +#define TRAINER_DIANA_3 478 +#define TRAINER_DIANA_4 479 +#define TRAINER_DIANA_5 480 +#define TRAINER_AMY_AND_LIV_1 481 +#define TRAINER_AMY_AND_LIV_2 482 +#define TRAINER_GINA_AND_MIA_1 483 +#define TRAINER_MIU_AND_YUKI 484 +#define TRAINER_AMY_AND_LIV_3 485 +#define TRAINER_GINA_AND_MIA_2 486 +#define TRAINER_AMY_AND_LIV_4 487 +#define TRAINER_AMY_AND_LIV_5 488 +#define TRAINER_AMY_AND_LIV_6 489 +#define TRAINER_HUEY 490 +#define TRAINER_EDMOND 491 +#define TRAINER_ERNEST_1 492 +#define TRAINER_DWAYNE 493 +#define TRAINER_PHILLIP 494 +#define TRAINER_LEONARD 495 +#define TRAINER_DUNCAN 496 +#define TRAINER_ERNEST_2 497 +#define TRAINER_ERNEST_3 498 +#define TRAINER_ERNEST_4 499 +#define TRAINER_ERNEST_5 500 +#define TRAINER_ELI 501 +#define TRAINER_ANNIKA 502 +#define TRAINER_JAZMYN 503 +#define TRAINER_JONAS 504 +#define TRAINER_KAYLEY 505 +#define TRAINER_AURON 506 +#define TRAINER_KELVIN 507 +#define TRAINER_MARLEY 508 +#define TRAINER_REYNA 509 +#define TRAINER_HUDSON 510 +#define TRAINER_CONOR 511 +#define TRAINER_EDWIN_1 512 +#define TRAINER_HECTOR 513 +#define TRAINER_TABITHA_1 514 +#define TRAINER_EDWIN_2 515 +#define TRAINER_EDWIN_3 516 +#define TRAINER_EDWIN_4 517 +#define TRAINER_EDWIN_5 518 +#define TRAINER_WALLY_1 519 +#define TRAINER_BRENDAN_1 520 +#define TRAINER_BRENDAN_2 521 +#define TRAINER_BRENDAN_3 522 +#define TRAINER_BRENDAN_4 523 +#define TRAINER_BRENDAN_5 524 +#define TRAINER_BRENDAN_6 525 +#define TRAINER_BRENDAN_7 526 +#define TRAINER_BRENDAN_8 527 +#define TRAINER_BRENDAN_9 528 +#define TRAINER_MAY_1 529 +#define TRAINER_MAY_2 530 +#define TRAINER_MAY_3 531 +#define TRAINER_MAY_4 532 +#define TRAINER_MAY_5 533 +#define TRAINER_MAY_6 534 +#define TRAINER_MAY_7 535 +#define TRAINER_MAY_8 536 +#define TRAINER_MAY_9 537 +#define TRAINER_ISAAC_1 538 +#define TRAINER_DAVIS 539 +#define TRAINER_MITCHELL 540 +#define TRAINER_ISAAC_2 541 +#define TRAINER_ISAAC_3 542 +#define TRAINER_ISAAC_4 543 +#define TRAINER_ISAAC_5 544 +#define TRAINER_LYDIA_1 545 +#define TRAINER_HALLE 546 +#define TRAINER_GARRISON 547 +#define TRAINER_LYDIA_2 548 +#define TRAINER_LYDIA_3 549 +#define TRAINER_LYDIA_4 550 +#define TRAINER_LYDIA_5 551 +#define TRAINER_JACKSON_1 552 +#define TRAINER_LORENZO 553 +#define TRAINER_SEBASTIAN 554 +#define TRAINER_JACKSON_2 555 +#define TRAINER_JACKSON_3 556 +#define TRAINER_JACKSON_4 557 +#define TRAINER_JACKSON_5 558 +#define TRAINER_CATHERINE_1 559 +#define TRAINER_JENNA 560 +#define TRAINER_SOPHIA 561 +#define TRAINER_CATHERINE_2 562 +#define TRAINER_CATHERINE_3 563 +#define TRAINER_CATHERINE_4 564 +#define TRAINER_CATHERINE_5 565 +#define TRAINER_JULIO 566 +#define TRAINER_GRUNT_27 567 +#define TRAINER_GRUNT_28 568 +#define TRAINER_GRUNT_29 569 +#define TRAINER_GRUNT_30 570 +#define TRAINER_MARC 571 +#define TRAINER_BRENDEN 572 +#define TRAINER_LILITH 573 +#define TRAINER_CRISTIAN 574 +#define TRAINER_SYLVIA 575 +#define TRAINER_LEONARDO 576 +#define TRAINER_ATHENA 577 +#define TRAINER_HARRISON 578 +#define TRAINER_GRUNT_31 579 +#define TRAINER_CLARENCE 580 +#define TRAINER_TERRY 581 +#define TRAINER_NATE 582 +#define TRAINER_KATHLEEN 583 +#define TRAINER_CLIFFORD 584 +#define TRAINER_NICHOLAS 585 +#define TRAINER_GRUNT_32 586 +#define TRAINER_GRUNT_33 587 +#define TRAINER_GRUNT_34 588 +#define TRAINER_GRUNT_35 589 +#define TRAINER_GRUNT_36 590 +#define TRAINER_MACEY 591 +#define TRAINER_BRENDAN_10 592 +#define TRAINER_BRENDAN_11 593 +#define TRAINER_PAXTON 594 +#define TRAINER_ISABELLA 595 +#define TRAINER_GRUNT_37 596 +#define TRAINER_TABITHA_2 597 +#define TRAINER_JONATHAN 598 +#define TRAINER_BRENDAN_12 599 +#define TRAINER_MAY_10 600 +#define TRAINER_MAXIE_1 601 +#define TRAINER_MAXIE_2 602 +#define TRAINER_TIANA 603 +#define TRAINER_HALEY_1 604 +#define TRAINER_JANICE 605 +#define TRAINER_VIVI 606 +#define TRAINER_HALEY_2 607 +#define TRAINER_HALEY_3 608 +#define TRAINER_HALEY_4 609 +#define TRAINER_HALEY_5 610 +#define TRAINER_SALLY 611 +#define TRAINER_ROBIN 612 +#define TRAINER_ANDREA 613 +#define TRAINER_CRISSY 614 +#define TRAINER_RICK 615 +#define TRAINER_LYLE 616 +#define TRAINER_JOSE 617 +#define TRAINER_DOUG 618 +#define TRAINER_GREG 619 +#define TRAINER_KENT 620 +#define TRAINER_JAMES_1 621 +#define TRAINER_JAMES_2 622 +#define TRAINER_JAMES_3 623 +#define TRAINER_JAMES_4 624 +#define TRAINER_JAMES_5 625 +#define TRAINER_BRICE 626 +#define TRAINER_TRENT_1 627 +#define TRAINER_LENNY 628 +#define TRAINER_LUCAS_1 629 +#define TRAINER_ALAN 630 +#define TRAINER_CLARK 631 +#define TRAINER_ERIC 632 +#define TRAINER_LUCAS_2 633 +#define TRAINER_MIKE_1 634 +#define TRAINER_MIKE_2 635 +#define TRAINER_TRENT_2 636 +#define TRAINER_TRENT_3 637 +#define TRAINER_TRENT_4 638 +#define TRAINER_TRENT_5 639 +#define TRAINER_DEZ_AND_LUKE 640 +#define TRAINER_LEA_AND_JED 641 +#define TRAINER_KIRA_AND_DAN_1 642 +#define TRAINER_KIRA_AND_DAN_2 643 +#define TRAINER_KIRA_AND_DAN_3 644 +#define TRAINER_KIRA_AND_DAN_4 645 +#define TRAINER_KIRA_AND_DAN_5 646 +#define TRAINER_JOHANNA 647 +#define TRAINER_GERALD 648 +#define TRAINER_VIVIAN 649 +#define TRAINER_DANIELLE 650 +#define TRAINER_HIDEO 651 +#define TRAINER_KEIGO 652 +#define TRAINER_RILEY 653 +#define TRAINER_FLINT 654 +#define TRAINER_ASHLEY 655 +#define TRAINER_WALLY_2 656 +#define TRAINER_WALLY_3 657 +#define TRAINER_WALLY_4 658 +#define TRAINER_WALLY_5 659 +#define TRAINER_WALLY_6 660 +#define TRAINER_BRENDAN_13 661 +#define TRAINER_BRENDAN_14 662 +#define TRAINER_BRENDAN_15 663 +#define TRAINER_MAY_11 664 +#define TRAINER_MAY_12 665 +#define TRAINER_MAY_13 666 +#define TRAINER_JONAH 667 +#define TRAINER_HENRY 668 +#define TRAINER_ROGER 669 +#define TRAINER_ALEXA 670 +#define TRAINER_RUBEN 671 +#define TRAINER_KOJI_1 672 +#define TRAINER_WAYNE 673 +#define TRAINER_AIDAN 674 +#define TRAINER_REED 675 +#define TRAINER_TISHA 676 +#define TRAINER_TORI_AND_TIA 677 +#define TRAINER_KIM_AND_IRIS 678 +#define TRAINER_TYRA_AND_IVY 679 +#define TRAINER_MEL_AND_PAUL 680 +#define TRAINER_JOHN_AND_JAY_1 681 +#define TRAINER_JOHN_AND_JAY_2 682 +#define TRAINER_JOHN_AND_JAY_3 683 +#define TRAINER_JOHN_AND_JAY_4 684 +#define TRAINER_JOHN_AND_JAY_5 685 +#define TRAINER_RELI_AND_IAN 686 +#define TRAINER_LILA_AND_ROY_1 687 +#define TRAINER_LILA_AND_ROY_2 688 +#define TRAINER_LILA_AND_ROY_3 689 +#define TRAINER_LILA_AND_ROY_4 690 +#define TRAINER_LILA_AND_ROY_5 691 +#define TRAINER_LISA_AND_RAY 692 +#define TRAINER_CHRIS 693 +#define TRAINER_DAWSON 694 +#define TRAINER_SARAH 695 +#define TRAINER_DARIAN 696 +#define TRAINER_HAILEY 697 +#define TRAINER_CHANDLER 698 +#define TRAINER_KALEB 699 +#define TRAINER_JOSEPH 700 +#define TRAINER_ALYSSA 701 +#define TRAINER_MARCOS 702 +#define TRAINER_RHETT 703 +#define TRAINER_TYRON 704 +#define TRAINER_CELINA 705 +#define TRAINER_BIANCA 706 +#define TRAINER_HAYDEN 707 +#define TRAINER_SOPHIE 708 +#define TRAINER_COBY 709 +#define TRAINER_LAWRENCE 710 +#define TRAINER_WYATT 711 +#define TRAINER_ANGELINA 712 +#define TRAINER_KAI 713 +#define TRAINER_CHARLOTTE 714 +#define TRAINER_DEANDRE 715 +#define TRAINER_GRUNT_38 716 +#define TRAINER_GRUNT_39 717 +#define TRAINER_GRUNT_40 718 +#define TRAINER_GRUNT_41 719 +#define TRAINER_GRUNT_42 720 +#define TRAINER_GRUNT_43 721 +#define TRAINER_GRUNT_44 722 +#define TRAINER_GRUNT_45 723 +#define TRAINER_GRUNT_46 724 +#define TRAINER_GRUNT_47 725 +#define TRAINER_GRUNT_48 726 +#define TRAINER_GRUNT_49 727 +#define TRAINER_GRUNT_50 728 +#define TRAINER_GRUNT_51 729 +#define TRAINER_GRUNT_52 730 +#define TRAINER_GRUNT_53 731 +#define TRAINER_TABITHA_3 732 +#define TRAINER_DARCY 733 +#define TRAINER_MAXIE_3 734 +#define TRAINER_PETE 735 +#define TRAINER_ISABELLE 736 +#define TRAINER_ANDRES_1 737 +#define TRAINER_JOSUE 738 +#define TRAINER_CAMRON 739 +#define TRAINER_CORY_1 740 +#define TRAINER_CAROLINA 741 +#define TRAINER_ELIJAH 742 +#define TRAINER_CELIA 743 +#define TRAINER_BRYAN 744 +#define TRAINER_BRANDEN 745 +#define TRAINER_BRYANT 746 +#define TRAINER_SHAYLA 747 +#define TRAINER_KYRA 748 +#define TRAINER_JAIDEN 749 +#define TRAINER_ALIX 750 +#define TRAINER_HELENE 751 +#define TRAINER_MARLENE 752 +#define TRAINER_DEVAN 753 +#define TRAINER_JOHNSON 754 +#define TRAINER_MELINA 755 +#define TRAINER_BRANDI 756 +#define TRAINER_AISHA 757 +#define TRAINER_MAKAYLA 758 +#define TRAINER_FABIAN 759 +#define TRAINER_DAYTON 760 +#define TRAINER_RACHEL 761 +#define TRAINER_LEONEL 762 +#define TRAINER_CALLIE 763 +#define TRAINER_CALE 764 +#define TRAINER_MYLES 765 +#define TRAINER_PAT 766 +#define TRAINER_CRISTIN_1 767 +#define TRAINER_MAY_14 768 +#define TRAINER_MAY_15 769 +#define TRAINER_ROXANNE_2 770 +#define TRAINER_ROXANNE_3 771 +#define TRAINER_ROXANNE_4 772 +#define TRAINER_ROXANNE_5 773 +#define TRAINER_BRAWLY_2 774 +#define TRAINER_BRAWLY_3 775 +#define TRAINER_BRAWLY_4 776 +#define TRAINER_BRAWLY_5 777 +#define TRAINER_WATTSON_2 778 +#define TRAINER_WATTSON_3 779 +#define TRAINER_WATTSON_4 780 +#define TRAINER_WATTSON_5 781 +#define TRAINER_FLANNERY_2 782 +#define TRAINER_FLANNERY_3 783 +#define TRAINER_FLANNERY_4 784 +#define TRAINER_FLANNERY_5 785 +#define TRAINER_NORMAN_2 786 +#define TRAINER_NORMAN_3 787 +#define TRAINER_NORMAN_4 788 +#define TRAINER_NORMAN_5 789 +#define TRAINER_WINONA_2 790 +#define TRAINER_WINONA_3 791 +#define TRAINER_WINONA_4 792 +#define TRAINER_WINONA_5 793 +#define TRAINER_TATE_AND_LIZA_2 794 +#define TRAINER_TATE_AND_LIZA_3 795 +#define TRAINER_TATE_AND_LIZA_4 796 +#define TRAINER_TATE_AND_LIZA_5 797 +#define TRAINER_JUAN_2 798 +#define TRAINER_JUAN_3 799 +#define TRAINER_JUAN_4 800 +#define TRAINER_JUAN_5 801 +#define TRAINER_ANGELO 802 +#define TRAINER_DARIUS 803 +#define TRAINER_STEVEN 804 +#define TRAINER_ANABEL 805 +#define TRAINER_TUCKER 806 +#define TRAINER_SPENSER 807 +#define TRAINER_GRETA 808 +#define TRAINER_NOLAND 809 +#define TRAINER_LUCY 810 +#define TRAINER_BRANDON 811 +#define TRAINER_ANDRES_2 812 +#define TRAINER_ANDRES_3 813 +#define TRAINER_ANDRES_4 814 +#define TRAINER_ANDRES_5 815 +#define TRAINER_CORY_2 816 +#define TRAINER_CORY_3 817 +#define TRAINER_CORY_4 818 +#define TRAINER_CORY_5 819 +#define TRAINER_PABLO_2 820 +#define TRAINER_PABLO_3 821 +#define TRAINER_PABLO_4 822 +#define TRAINER_PABLO_5 823 +#define TRAINER_KOJI_2 824 +#define TRAINER_KOJI_3 825 +#define TRAINER_KOJI_4 826 +#define TRAINER_KOJI_5 827 +#define TRAINER_CRISTIN_2 828 +#define TRAINER_CRISTIN_3 829 +#define TRAINER_CRISTIN_4 830 +#define TRAINER_CRISTIN_5 831 +#define TRAINER_FERNANDO_2 832 +#define TRAINER_FERNANDO_3 833 +#define TRAINER_FERNANDO_4 834 +#define TRAINER_FERNANDO_5 835 +#define TRAINER_SAWYER_2 836 +#define TRAINER_SAWYER_3 837 +#define TRAINER_SAWYER_4 838 +#define TRAINER_SAWYER_5 839 +#define TRAINER_GABRIELLE_2 840 +#define TRAINER_GABRIELLE_3 841 +#define TRAINER_GABRIELLE_4 842 +#define TRAINER_GABRIELLE_5 843 +#define TRAINER_THALIA_2 844 +#define TRAINER_THALIA_3 845 +#define TRAINER_THALIA_4 846 +#define TRAINER_THALIA_5 847 +#define TRAINER_MARIELA 848 +#define TRAINER_ALVARO 849 +#define TRAINER_EVERETT 850 +#define TRAINER_RED 851 +#define TRAINER_LEAF 852 +#define TRAINER_BRENDAN_16 853 +#define TRAINER_MAY_16 854 + +#define TRAINERS_COUNT 855 #endif // GUARD_CONSTANTS_OPPONENTS_H diff --git a/include/constants/trainers.h b/include/constants/trainers.h index 43ea6d0b6..57c7fd523 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -1,863 +1,7 @@ #ifndef GUARD_TRAINERS_H #define GUARD_TRAINERS_H -#define TRAINER_NONE 0 -#define TRAINER_SAWYER_1 1 -#define TRAINER_GRUNT_1 2 -#define TRAINER_GRUNT_2 3 -#define TRAINER_GRUNT_3 4 -#define TRAINER_GRUNT_4 5 -#define TRAINER_GRUNT_5 6 -#define TRAINER_GRUNT_6 7 -#define TRAINER_GRUNT_7 8 -#define TRAINER_GABRIELLE_1 9 -#define TRAINER_GRUNT_8 10 -#define TRAINER_MARCEL 11 -#define TRAINER_ALBERTO 12 -#define TRAINER_ED 13 -#define TRAINER_GRUNT_9 14 -#define TRAINER_DECLAN 15 -#define TRAINER_GRUNT_10 16 -#define TRAINER_GRUNT_11 17 -#define TRAINER_GRUNT_12 18 -#define TRAINER_GRUNT_13 19 -#define TRAINER_GRUNT_14 20 -#define TRAINER_GRUNT_15 21 -#define TRAINER_GRUNT_16 22 -#define TRAINER_GRUNT_17 23 -#define TRAINER_GRUNT_18 24 -#define TRAINER_GRUNT_19 25 -#define TRAINER_GRUNT_20 26 -#define TRAINER_GRUNT_21 27 -#define TRAINER_GRUNT_22 28 -#define TRAINER_FREDRICK 29 -#define TRAINER_MATT 30 -#define TRAINER_ZANDER 31 -#define TRAINER_SHELLY_1 32 -#define TRAINER_SHELLY_2 33 -#define TRAINER_ARCHIE 34 -#define TRAINER_LEAH 35 -#define TRAINER_DAISY 36 -#define TRAINER_ROSE_1 37 -#define TRAINER_FELIX 38 -#define TRAINER_VIOLET 39 -#define TRAINER_ROSE_2 40 -#define TRAINER_ROSE_3 41 -#define TRAINER_ROSE_4 42 -#define TRAINER_ROSE_5 43 -#define TRAINER_DUSTY_1 44 -#define TRAINER_CHIP 45 -#define TRAINER_FOSTER 46 -#define TRAINER_DUSTY_2 47 -#define TRAINER_DUSTY_3 48 -#define TRAINER_DUSTY_4 49 -#define TRAINER_DUSTY_5 50 -#define TRAINER_GABBY_AND_TY_1 51 -#define TRAINER_GABBY_AND_TY_2 52 -#define TRAINER_GABBY_AND_TY_3 53 -#define TRAINER_GABBY_AND_TY_4 54 -#define TRAINER_GABBY_AND_TY_5 55 -#define TRAINER_GABBY_AND_TY_6 56 -#define TRAINER_LOLA_1 57 -#define TRAINER_AUSTINA 58 -#define TRAINER_GWEN 59 -#define TRAINER_LOLA_2 60 -#define TRAINER_LOLA_3 61 -#define TRAINER_LOLA_4 62 -#define TRAINER_LOLA_5 63 -#define TRAINER_RICKY_1 64 -#define TRAINER_SIMON 65 -#define TRAINER_CHARLIE 66 -#define TRAINER_RICKY_2 67 -#define TRAINER_RICKY_3 68 -#define TRAINER_RICKY_4 69 -#define TRAINER_RICKY_5 70 -#define TRAINER_RANDALL 71 -#define TRAINER_PARKER 72 -#define TRAINER_GEORGE 73 -#define TRAINER_BERKE 74 -#define TRAINER_BRAXTON 75 -#define TRAINER_VINCENT 76 -#define TRAINER_LEROY 77 -#define TRAINER_WILTON_1 78 -#define TRAINER_EDGAR 79 -#define TRAINER_ALBERT 80 -#define TRAINER_SAMUEL 81 -#define TRAINER_VITO 82 -#define TRAINER_OWEN 83 -#define TRAINER_WILTON_2 84 -#define TRAINER_WILTON_3 85 -#define TRAINER_WILTON_4 86 -#define TRAINER_WILTON_5 87 -#define TRAINER_WARREN 88 -#define TRAINER_MARY 89 -#define TRAINER_ALEXIA 90 -#define TRAINER_JODY 91 -#define TRAINER_WENDY 92 -#define TRAINER_KEIRA 93 -#define TRAINER_BROOKE_1 94 -#define TRAINER_JENNIFER 95 -#define TRAINER_HOPE 96 -#define TRAINER_SHANNON 97 -#define TRAINER_MICHELLE 98 -#define TRAINER_CAROLINE 99 -#define TRAINER_JULIE 100 -#define TRAINER_BROOKE_2 101 -#define TRAINER_BROOKE_3 102 -#define TRAINER_BROOKE_4 103 -#define TRAINER_BROOKE_5 104 -#define TRAINER_PATRICIA 105 -#define TRAINER_KINDRA 106 -#define TRAINER_TAMMY 107 -#define TRAINER_VALERIE_1 108 -#define TRAINER_TASHA 109 -#define TRAINER_VALERIE_2 110 -#define TRAINER_VALERIE_3 111 -#define TRAINER_VALERIE_4 112 -#define TRAINER_VALERIE_5 113 -#define TRAINER_CINDY_1 114 -#define TRAINER_DAPHNE 115 -#define TRAINER_GRUNT_23 116 -#define TRAINER_CINDY_2 117 -#define TRAINER_BRIANNA 118 -#define TRAINER_NAOMI 119 -#define TRAINER_CINDY_3 120 -#define TRAINER_CINDY_4 121 -#define TRAINER_CINDY_5 122 -#define TRAINER_CINDY_6 123 -#define TRAINER_MELISSA 124 -#define TRAINER_SHEILA 125 -#define TRAINER_SHIRLEY 126 -#define TRAINER_JESSICA_1 127 -#define TRAINER_CONNIE 128 -#define TRAINER_BRIDGET 129 -#define TRAINER_OLIVIA 130 -#define TRAINER_TIFFANY 131 -#define TRAINER_JESSICA_2 132 -#define TRAINER_JESSICA_3 133 -#define TRAINER_JESSICA_4 134 -#define TRAINER_JESSICA_5 135 -#define TRAINER_WINSTON_1 136 -#define TRAINER_MOLLIE 137 -#define TRAINER_GARRET 138 -#define TRAINER_WINSTON_2 139 -#define TRAINER_WINSTON_3 140 -#define TRAINER_WINSTON_4 141 -#define TRAINER_WINSTON_5 142 -#define TRAINER_STEVE_1 143 -#define TRAINER_THALIA_1 144 -#define TRAINER_MARK 145 -#define TRAINER_GRUNT_24 146 -#define TRAINER_STEVE_2 147 -#define TRAINER_STEVE_3 148 -#define TRAINER_STEVE_4 149 -#define TRAINER_STEVE_5 150 -#define TRAINER_LUIS 151 -#define TRAINER_DOMINIK 152 -#define TRAINER_DOUGLAS 153 -#define TRAINER_DARRIN 154 -#define TRAINER_TONY_1 155 -#define TRAINER_JEROME 156 -#define TRAINER_MATTHEW 157 -#define TRAINER_DAVID 158 -#define TRAINER_SPENCER 159 -#define TRAINER_ROLAND 160 -#define TRAINER_NOLEN 161 -#define TRAINER_STAN 162 -#define TRAINER_BARRY 163 -#define TRAINER_DEAN 164 -#define TRAINER_RODNEY 165 -#define TRAINER_RICHARD 166 -#define TRAINER_HERMAN 167 -#define TRAINER_SANTIAGO 168 -#define TRAINER_GILBERT 169 -#define TRAINER_FRANKLIN 170 -#define TRAINER_KEVIN 171 -#define TRAINER_JACK 172 -#define TRAINER_DUDLEY 173 -#define TRAINER_CHAD 174 -#define TRAINER_TONY_2 175 -#define TRAINER_TONY_3 176 -#define TRAINER_TONY_4 177 -#define TRAINER_TONY_5 178 -#define TRAINER_TAKAO 179 -#define TRAINER_HITOSHI 180 -#define TRAINER_KIYO 181 -#define TRAINER_KOICHI 182 -#define TRAINER_NOB_1 183 -#define TRAINER_NOB_2 184 -#define TRAINER_NOB_3 185 -#define TRAINER_NOB_4 186 -#define TRAINER_NOB_5 187 -#define TRAINER_YUJI 188 -#define TRAINER_DAISUKE 189 -#define TRAINER_ATSUSHI 190 -#define TRAINER_KIRK 191 -#define TRAINER_GRUNT_25 192 -#define TRAINER_GRUNT_26 193 -#define TRAINER_SHAWN 194 -#define TRAINER_FERNANDO_1 195 -#define TRAINER_DALTON_1 196 -#define TRAINER_DALTON_2 197 -#define TRAINER_DALTON_3 198 -#define TRAINER_DALTON_4 199 -#define TRAINER_DALTON_5 200 -#define TRAINER_COLE 201 -#define TRAINER_JEFF 202 -#define TRAINER_AXLE 203 -#define TRAINER_JACE 204 -#define TRAINER_KEEGAN 205 -#define TRAINER_BERNIE_1 206 -#define TRAINER_BERNIE_2 207 -#define TRAINER_BERNIE_3 208 -#define TRAINER_BERNIE_4 209 -#define TRAINER_BERNIE_5 210 -#define TRAINER_DREW 211 -#define TRAINER_BEAU 212 -#define TRAINER_LARRY 213 -#define TRAINER_SHANE 214 -#define TRAINER_JUSTIN 215 -#define TRAINER_ETHAN_1 216 -#define TRAINER_AUTUMN 217 -#define TRAINER_TRAVIS 218 -#define TRAINER_ETHAN_2 219 -#define TRAINER_ETHAN_3 220 -#define TRAINER_ETHAN_4 221 -#define TRAINER_ETHAN_5 222 -#define TRAINER_BRENT 223 -#define TRAINER_DONALD 224 -#define TRAINER_TAYLOR 225 -#define TRAINER_JEFFREY_1 226 -#define TRAINER_DEREK 227 -#define TRAINER_JEFFREY_2 228 -#define TRAINER_JEFFREY_3 229 -#define TRAINER_JEFFREY_4 230 -#define TRAINER_JEFFREY_5 231 -#define TRAINER_EDWARD 232 -#define TRAINER_PRESTON 233 -#define TRAINER_VIRGIL 234 -#define TRAINER_BLAKE 235 -#define TRAINER_WILLIAM 236 -#define TRAINER_JOSHUA 237 -#define TRAINER_CAMERON_1 238 -#define TRAINER_CAMERON_2 239 -#define TRAINER_CAMERON_3 240 -#define TRAINER_CAMERON_4 241 -#define TRAINER_CAMERON_5 242 -#define TRAINER_JACLYN 243 -#define TRAINER_HANNAH 244 -#define TRAINER_SAMANTHA 245 -#define TRAINER_MAURA 246 -#define TRAINER_KAYLA 247 -#define TRAINER_ALEXIS 248 -#define TRAINER_JACKI_1 249 -#define TRAINER_JACKI_2 250 -#define TRAINER_JACKI_3 251 -#define TRAINER_JACKI_4 252 -#define TRAINER_JACKI_5 253 -#define TRAINER_WALTER_1 254 -#define TRAINER_MICAH 255 -#define TRAINER_THOMAS 256 -#define TRAINER_WALTER_2 257 -#define TRAINER_WALTER_3 258 -#define TRAINER_WALTER_4 259 -#define TRAINER_WALTER_5 260 -#define TRAINER_SIDNEY 261 -#define TRAINER_PHOEBE 262 -#define TRAINER_GLACIA 263 -#define TRAINER_DRAKE 264 -#define TRAINER_ROXANNE_1 265 -#define TRAINER_BRAWLY_1 266 -#define TRAINER_WATTSON_1 267 -#define TRAINER_FLANNERY_1 268 -#define TRAINER_NORMAN_1 269 -#define TRAINER_WINONA_1 270 -#define TRAINER_TATE_AND_LIZA_1 271 -#define TRAINER_JUAN_1 272 -#define TRAINER_JERRY_1 273 -#define TRAINER_TED 274 -#define TRAINER_PAUL 275 -#define TRAINER_JERRY_2 276 -#define TRAINER_JERRY_3 277 -#define TRAINER_JERRY_4 278 -#define TRAINER_JERRY_5 279 -#define TRAINER_KAREN_1 280 -#define TRAINER_GEORGIA 281 -#define TRAINER_KAREN_2 282 -#define TRAINER_KAREN_3 283 -#define TRAINER_KAREN_4 284 -#define TRAINER_KAREN_5 285 -#define TRAINER_KATE_AND_JOY 286 -#define TRAINER_ANNA_AND_MEG_1 287 -#define TRAINER_ANNA_AND_MEG_2 288 -#define TRAINER_ANNA_AND_MEG_3 289 -#define TRAINER_ANNA_AND_MEG_4 290 -#define TRAINER_ANNA_AND_MEG_5 291 -#define TRAINER_VICTOR 292 -#define TRAINER_MIGUEL_1 293 -#define TRAINER_COLTON 294 -#define TRAINER_MIGUEL_2 295 -#define TRAINER_MIGUEL_3 296 -#define TRAINER_MIGUEL_4 297 -#define TRAINER_MIGUEL_5 298 -#define TRAINER_VICTORIA 299 -#define TRAINER_VANESSA 300 -#define TRAINER_BETHANY 301 -#define TRAINER_ISABEL_1 302 -#define TRAINER_ISABEL_2 303 -#define TRAINER_ISABEL_3 304 -#define TRAINER_ISABEL_4 305 -#define TRAINER_ISABEL_5 306 -#define TRAINER_TIMOTHY_1 307 -#define TRAINER_TIMOTHY_2 308 -#define TRAINER_TIMOTHY_3 309 -#define TRAINER_TIMOTHY_4 310 -#define TRAINER_TIMOTHY_5 311 -#define TRAINER_VICKY 312 -#define TRAINER_SHELBY_1 313 -#define TRAINER_SHELBY_2 314 -#define TRAINER_SHELBY_3 315 -#define TRAINER_SHELBY_4 316 -#define TRAINER_SHELBY_5 317 -#define TRAINER_CALVIN_1 318 -#define TRAINER_BILLY 319 -#define TRAINER_JOSH 320 -#define TRAINER_TOMMY 321 -#define TRAINER_JOEY 322 -#define TRAINER_BEN 323 -#define TRAINER_QUINCY 324 -#define TRAINER_KATELYNN 325 -#define TRAINER_JAYLEN 326 -#define TRAINER_DILLON 327 -#define TRAINER_CALVIN_2 328 -#define TRAINER_CALVIN_3 329 -#define TRAINER_CALVIN_4 330 -#define TRAINER_CALVIN_5 331 -#define TRAINER_EDDIE 332 -#define TRAINER_ALLEN 333 -#define TRAINER_TIMMY 334 -#define TRAINER_WALLACE 335 -#define TRAINER_ANDREW 336 -#define TRAINER_IVAN 337 -#define TRAINER_CLAUDE 338 -#define TRAINER_ELLIOT_1 339 -#define TRAINER_NED 340 -#define TRAINER_DALE 341 -#define TRAINER_NOLAN 342 -#define TRAINER_BARNY 343 -#define TRAINER_WADE 344 -#define TRAINER_CARTER 345 -#define TRAINER_ELLIOT_2 346 -#define TRAINER_ELLIOT_3 347 -#define TRAINER_ELLIOT_4 348 -#define TRAINER_ELLIOT_5 349 -#define TRAINER_RONALD 350 -#define TRAINER_JACOB 351 -#define TRAINER_ANTHONY 352 -#define TRAINER_BENJAMIN_1 353 -#define TRAINER_BENJAMIN_2 354 -#define TRAINER_BENJAMIN_3 355 -#define TRAINER_BENJAMIN_4 356 -#define TRAINER_BENJAMIN_5 357 -#define TRAINER_ABIGAIL_1 358 -#define TRAINER_JASMINE 359 -#define TRAINER_ABIGAIL_2 360 -#define TRAINER_ABIGAIL_3 361 -#define TRAINER_ABIGAIL_4 362 -#define TRAINER_ABIGAIL_5 363 -#define TRAINER_DYLAN_1 364 -#define TRAINER_DYLAN_2 365 -#define TRAINER_DYLAN_3 366 -#define TRAINER_DYLAN_4 367 -#define TRAINER_DYLAN_5 368 -#define TRAINER_MARIA_1 369 -#define TRAINER_MARIA_2 370 -#define TRAINER_MARIA_3 371 -#define TRAINER_MARIA_4 372 -#define TRAINER_MARIA_5 373 -#define TRAINER_CAMDEN 374 -#define TRAINER_DEMETRIUS 375 -#define TRAINER_ISAIAH_1 376 -#define TRAINER_PABLO_1 377 -#define TRAINER_CHASE 378 -#define TRAINER_ISAIAH_2 379 -#define TRAINER_ISAIAH_3 380 -#define TRAINER_ISAIAH_4 381 -#define TRAINER_ISAIAH_5 382 -#define TRAINER_ISOBEL 383 -#define TRAINER_DONNY 384 -#define TRAINER_TALIA 385 -#define TRAINER_KATELYN_1 386 -#define TRAINER_ALLISON 387 -#define TRAINER_KATELYN_2 388 -#define TRAINER_KATELYN_3 389 -#define TRAINER_KATELYN_4 390 -#define TRAINER_KATELYN_5 391 -#define TRAINER_NICOLAS_1 392 -#define TRAINER_NICOLAS_2 393 -#define TRAINER_NICOLAS_3 394 -#define TRAINER_NICOLAS_4 395 -#define TRAINER_NICOLAS_5 396 -#define TRAINER_AARON 397 -#define TRAINER_PERRY 398 -#define TRAINER_HUGH 399 -#define TRAINER_PHIL 400 -#define TRAINER_JARED 401 -#define TRAINER_HUMBERTO 402 -#define TRAINER_PRESLEY 403 -#define TRAINER_EDWARDO 404 -#define TRAINER_COLIN 405 -#define TRAINER_ROBERT_1 406 -#define TRAINER_BENNY 407 -#define TRAINER_CHESTER 408 -#define TRAINER_ROBERT_2 409 -#define TRAINER_ROBERT_3 410 -#define TRAINER_ROBERT_4 411 -#define TRAINER_ROBERT_5 412 -#define TRAINER_ALEX 413 -#define TRAINER_BECK 414 -#define TRAINER_YASU 415 -#define TRAINER_TAKASHI 416 -#define TRAINER_DIANNE 417 -#define TRAINER_JANI 418 -#define TRAINER_LAO_1 419 -#define TRAINER_LUNG 420 -#define TRAINER_LAO_2 421 -#define TRAINER_LAO_3 422 -#define TRAINER_LAO_4 423 -#define TRAINER_LAO_5 424 -#define TRAINER_JOCELYN 425 -#define TRAINER_LAURA 426 -#define TRAINER_CYNDY_1 427 -#define TRAINER_CORA 428 -#define TRAINER_PAULA 429 -#define TRAINER_CYNDY_2 430 -#define TRAINER_CYNDY_3 431 -#define TRAINER_CYNDY_4 432 -#define TRAINER_CYNDY_5 433 -#define TRAINER_MADELINE_1 434 -#define TRAINER_CLARISSA 435 -#define TRAINER_ANGELICA 436 -#define TRAINER_MADELINE_2 437 -#define TRAINER_MADELINE_3 438 -#define TRAINER_MADELINE_4 439 -#define TRAINER_MADELINE_5 440 -#define TRAINER_BEVERLY 441 -#define TRAINER_IMANI 442 -#define TRAINER_KYLA 443 -#define TRAINER_DENISE 444 -#define TRAINER_BETH 445 -#define TRAINER_TARA 446 -#define TRAINER_MISSY 447 -#define TRAINER_ALICE 448 -#define TRAINER_JENNY_1 449 -#define TRAINER_GRACE 450 -#define TRAINER_TANYA 451 -#define TRAINER_SHARON 452 -#define TRAINER_NIKKI 453 -#define TRAINER_BRENDA 454 -#define TRAINER_KATIE 455 -#define TRAINER_SUSIE 456 -#define TRAINER_KARA 457 -#define TRAINER_DANA 458 -#define TRAINER_SIENNA 459 -#define TRAINER_DEBRA 460 -#define TRAINER_LINDA 461 -#define TRAINER_KAYLEE 462 -#define TRAINER_LAUREL 463 -#define TRAINER_CARLEE 464 -#define TRAINER_JENNY_2 465 -#define TRAINER_JENNY_3 466 -#define TRAINER_JENNY_4 467 -#define TRAINER_JENNY_5 468 -#define TRAINER_HEIDI 469 -#define TRAINER_BECKY 470 -#define TRAINER_CAROL 471 -#define TRAINER_NANCY 472 -#define TRAINER_MARTHA 473 -#define TRAINER_DIANA_1 474 -#define TRAINER_CEDRIC 475 -#define TRAINER_IRENE 476 -#define TRAINER_DIANA_2 477 -#define TRAINER_DIANA_3 478 -#define TRAINER_DIANA_4 479 -#define TRAINER_DIANA_5 480 -#define TRAINER_AMY_AND_LIV_1 481 -#define TRAINER_AMY_AND_LIV_2 482 -#define TRAINER_GINA_AND_MIA_1 483 -#define TRAINER_MIU_AND_YUKI 484 -#define TRAINER_AMY_AND_LIV_3 485 -#define TRAINER_GINA_AND_MIA_2 486 -#define TRAINER_AMY_AND_LIV_4 487 -#define TRAINER_AMY_AND_LIV_5 488 -#define TRAINER_AMY_AND_LIV_6 489 -#define TRAINER_HUEY 490 -#define TRAINER_EDMOND 491 -#define TRAINER_ERNEST_1 492 -#define TRAINER_DWAYNE 493 -#define TRAINER_PHILLIP 494 -#define TRAINER_LEONARD 495 -#define TRAINER_DUNCAN 496 -#define TRAINER_ERNEST_2 497 -#define TRAINER_ERNEST_3 498 -#define TRAINER_ERNEST_4 499 -#define TRAINER_ERNEST_5 500 -#define TRAINER_ELI 501 -#define TRAINER_ANNIKA 502 -#define TRAINER_JAZMYN 503 -#define TRAINER_JONAS 504 -#define TRAINER_KAYLEY 505 -#define TRAINER_AURON 506 -#define TRAINER_KELVIN 507 -#define TRAINER_MARLEY 508 -#define TRAINER_REYNA 509 -#define TRAINER_HUDSON 510 -#define TRAINER_CONOR 511 -#define TRAINER_EDWIN_1 512 -#define TRAINER_HECTOR 513 -#define TRAINER_TABITHA_1 514 -#define TRAINER_EDWIN_2 515 -#define TRAINER_EDWIN_3 516 -#define TRAINER_EDWIN_4 517 -#define TRAINER_EDWIN_5 518 -#define TRAINER_WALLY_1 519 -#define TRAINER_BRENDAN_1 520 -#define TRAINER_BRENDAN_2 521 -#define TRAINER_BRENDAN_3 522 -#define TRAINER_BRENDAN_4 523 -#define TRAINER_BRENDAN_5 524 -#define TRAINER_BRENDAN_6 525 -#define TRAINER_BRENDAN_7 526 -#define TRAINER_BRENDAN_8 527 -#define TRAINER_BRENDAN_9 528 -#define TRAINER_MAY_1 529 -#define TRAINER_MAY_2 530 -#define TRAINER_MAY_3 531 -#define TRAINER_MAY_4 532 -#define TRAINER_MAY_5 533 -#define TRAINER_MAY_6 534 -#define TRAINER_MAY_7 535 -#define TRAINER_MAY_8 536 -#define TRAINER_MAY_9 537 -#define TRAINER_ISAAC_1 538 -#define TRAINER_DAVIS 539 -#define TRAINER_MITCHELL 540 -#define TRAINER_ISAAC_2 541 -#define TRAINER_ISAAC_3 542 -#define TRAINER_ISAAC_4 543 -#define TRAINER_ISAAC_5 544 -#define TRAINER_LYDIA_1 545 -#define TRAINER_HALLE 546 -#define TRAINER_GARRISON 547 -#define TRAINER_LYDIA_2 548 -#define TRAINER_LYDIA_3 549 -#define TRAINER_LYDIA_4 550 -#define TRAINER_LYDIA_5 551 -#define TRAINER_JACKSON_1 552 -#define TRAINER_LORENZO 553 -#define TRAINER_SEBASTIAN 554 -#define TRAINER_JACKSON_2 555 -#define TRAINER_JACKSON_3 556 -#define TRAINER_JACKSON_4 557 -#define TRAINER_JACKSON_5 558 -#define TRAINER_CATHERINE_1 559 -#define TRAINER_JENNA 560 -#define TRAINER_SOPHIA 561 -#define TRAINER_CATHERINE_2 562 -#define TRAINER_CATHERINE_3 563 -#define TRAINER_CATHERINE_4 564 -#define TRAINER_CATHERINE_5 565 -#define TRAINER_JULIO 566 -#define TRAINER_GRUNT_27 567 -#define TRAINER_GRUNT_28 568 -#define TRAINER_GRUNT_29 569 -#define TRAINER_GRUNT_30 570 -#define TRAINER_MARC 571 -#define TRAINER_BRENDEN 572 -#define TRAINER_LILITH 573 -#define TRAINER_CRISTIAN 574 -#define TRAINER_SYLVIA 575 -#define TRAINER_LEONARDO 576 -#define TRAINER_ATHENA 577 -#define TRAINER_HARRISON 578 -#define TRAINER_GRUNT_31 579 -#define TRAINER_CLARENCE 580 -#define TRAINER_TERRY 581 -#define TRAINER_NATE 582 -#define TRAINER_KATHLEEN 583 -#define TRAINER_CLIFFORD 584 -#define TRAINER_NICHOLAS 585 -#define TRAINER_GRUNT_32 586 -#define TRAINER_GRUNT_33 587 -#define TRAINER_GRUNT_34 588 -#define TRAINER_GRUNT_35 589 -#define TRAINER_GRUNT_36 590 -#define TRAINER_MACEY 591 -#define TRAINER_BRENDAN_10 592 -#define TRAINER_BRENDAN_11 593 -#define TRAINER_PAXTON 594 -#define TRAINER_ISABELLA 595 -#define TRAINER_GRUNT_37 596 -#define TRAINER_TABITHA_2 597 -#define TRAINER_JONATHAN 598 -#define TRAINER_BRENDAN_12 599 -#define TRAINER_MAY_10 600 -#define TRAINER_MAXIE_1 601 -#define TRAINER_MAXIE_2 602 -#define TRAINER_TIANA 603 -#define TRAINER_HALEY_1 604 -#define TRAINER_JANICE 605 -#define TRAINER_VIVI 606 -#define TRAINER_HALEY_2 607 -#define TRAINER_HALEY_3 608 -#define TRAINER_HALEY_4 609 -#define TRAINER_HALEY_5 610 -#define TRAINER_SALLY 611 -#define TRAINER_ROBIN 612 -#define TRAINER_ANDREA 613 -#define TRAINER_CRISSY 614 -#define TRAINER_RICK 615 -#define TRAINER_LYLE 616 -#define TRAINER_JOSE 617 -#define TRAINER_DOUG 618 -#define TRAINER_GREG 619 -#define TRAINER_KENT 620 -#define TRAINER_JAMES_1 621 -#define TRAINER_JAMES_2 622 -#define TRAINER_JAMES_3 623 -#define TRAINER_JAMES_4 624 -#define TRAINER_JAMES_5 625 -#define TRAINER_BRICE 626 -#define TRAINER_TRENT_1 627 -#define TRAINER_LENNY 628 -#define TRAINER_LUCAS_1 629 -#define TRAINER_ALAN 630 -#define TRAINER_CLARK 631 -#define TRAINER_ERIC 632 -#define TRAINER_LUCAS_2 633 -#define TRAINER_MIKE_1 634 -#define TRAINER_MIKE_2 635 -#define TRAINER_TRENT_2 636 -#define TRAINER_TRENT_3 637 -#define TRAINER_TRENT_4 638 -#define TRAINER_TRENT_5 639 -#define TRAINER_DEZ_AND_LUKE 640 -#define TRAINER_LEA_AND_JED 641 -#define TRAINER_KIRA_AND_DAN_1 642 -#define TRAINER_KIRA_AND_DAN_2 643 -#define TRAINER_KIRA_AND_DAN_3 644 -#define TRAINER_KIRA_AND_DAN_4 645 -#define TRAINER_KIRA_AND_DAN_5 646 -#define TRAINER_JOHANNA 647 -#define TRAINER_GERALD 648 -#define TRAINER_VIVIAN 649 -#define TRAINER_DANIELLE 650 -#define TRAINER_HIDEO 651 -#define TRAINER_KEIGO 652 -#define TRAINER_RILEY 653 -#define TRAINER_FLINT 654 -#define TRAINER_ASHLEY 655 -#define TRAINER_WALLY_2 656 -#define TRAINER_WALLY_3 657 -#define TRAINER_WALLY_4 658 -#define TRAINER_WALLY_5 659 -#define TRAINER_WALLY_6 660 -#define TRAINER_BRENDAN_13 661 -#define TRAINER_BRENDAN_14 662 -#define TRAINER_BRENDAN_15 663 -#define TRAINER_MAY_11 664 -#define TRAINER_MAY_12 665 -#define TRAINER_MAY_13 666 -#define TRAINER_JONAH 667 -#define TRAINER_HENRY 668 -#define TRAINER_ROGER 669 -#define TRAINER_ALEXA 670 -#define TRAINER_RUBEN 671 -#define TRAINER_KOJI_1 672 -#define TRAINER_WAYNE 673 -#define TRAINER_AIDAN 674 -#define TRAINER_REED 675 -#define TRAINER_TISHA 676 -#define TRAINER_TORI_AND_TIA 677 -#define TRAINER_KIM_AND_IRIS 678 -#define TRAINER_TYRA_AND_IVY 679 -#define TRAINER_MEL_AND_PAUL 680 -#define TRAINER_JOHN_AND_JAY_1 681 -#define TRAINER_JOHN_AND_JAY_2 682 -#define TRAINER_JOHN_AND_JAY_3 683 -#define TRAINER_JOHN_AND_JAY_4 684 -#define TRAINER_JOHN_AND_JAY_5 685 -#define TRAINER_RELI_AND_IAN 686 -#define TRAINER_LILA_AND_ROY_1 687 -#define TRAINER_LILA_AND_ROY_2 688 -#define TRAINER_LILA_AND_ROY_3 689 -#define TRAINER_LILA_AND_ROY_4 690 -#define TRAINER_LILA_AND_ROY_5 691 -#define TRAINER_LISA_AND_RAY 692 -#define TRAINER_CHRIS 693 -#define TRAINER_DAWSON 694 -#define TRAINER_SARAH 695 -#define TRAINER_DARIAN 696 -#define TRAINER_HAILEY 697 -#define TRAINER_CHANDLER 698 -#define TRAINER_KALEB 699 -#define TRAINER_JOSEPH 700 -#define TRAINER_ALYSSA 701 -#define TRAINER_MARCOS 702 -#define TRAINER_RHETT 703 -#define TRAINER_TYRON 704 -#define TRAINER_CELINA 705 -#define TRAINER_BIANCA 706 -#define TRAINER_HAYDEN 707 -#define TRAINER_SOPHIE 708 -#define TRAINER_COBY 709 -#define TRAINER_LAWRENCE 710 -#define TRAINER_WYATT 711 -#define TRAINER_ANGELINA 712 -#define TRAINER_KAI 713 -#define TRAINER_CHARLOTTE 714 -#define TRAINER_DEANDRE 715 -#define TRAINER_GRUNT_38 716 -#define TRAINER_GRUNT_39 717 -#define TRAINER_GRUNT_40 718 -#define TRAINER_GRUNT_41 719 -#define TRAINER_GRUNT_42 720 -#define TRAINER_GRUNT_43 721 -#define TRAINER_GRUNT_44 722 -#define TRAINER_GRUNT_45 723 -#define TRAINER_GRUNT_46 724 -#define TRAINER_GRUNT_47 725 -#define TRAINER_GRUNT_48 726 -#define TRAINER_GRUNT_49 727 -#define TRAINER_GRUNT_50 728 -#define TRAINER_GRUNT_51 729 -#define TRAINER_GRUNT_52 730 -#define TRAINER_GRUNT_53 731 -#define TRAINER_TABITHA_3 732 -#define TRAINER_DARCY 733 -#define TRAINER_MAXIE_3 734 -#define TRAINER_PETE 735 -#define TRAINER_ISABELLE 736 -#define TRAINER_ANDRES_1 737 -#define TRAINER_JOSUE 738 -#define TRAINER_CAMRON 739 -#define TRAINER_CORY_1 740 -#define TRAINER_CAROLINA 741 -#define TRAINER_ELIJAH 742 -#define TRAINER_CELIA 743 -#define TRAINER_BRYAN 744 -#define TRAINER_BRANDEN 745 -#define TRAINER_BRYANT 746 -#define TRAINER_SHAYLA 747 -#define TRAINER_KYRA 748 -#define TRAINER_JAIDEN 749 -#define TRAINER_ALIX 750 -#define TRAINER_HELENE 751 -#define TRAINER_MARLENE 752 -#define TRAINER_DEVAN 753 -#define TRAINER_JOHNSON 754 -#define TRAINER_MELINA 755 -#define TRAINER_BRANDI 756 -#define TRAINER_AISHA 757 -#define TRAINER_MAKAYLA 758 -#define TRAINER_FABIAN 759 -#define TRAINER_DAYTON 760 -#define TRAINER_RACHEL 761 -#define TRAINER_LEONEL 762 -#define TRAINER_CALLIE 763 -#define TRAINER_CALE 764 -#define TRAINER_MYLES 765 -#define TRAINER_PAT 766 -#define TRAINER_CRISTIN_1 767 -#define TRAINER_MAY_14 768 -#define TRAINER_MAY_15 769 -#define TRAINER_ROXANNE_2 770 -#define TRAINER_ROXANNE_3 771 -#define TRAINER_ROXANNE_4 772 -#define TRAINER_ROXANNE_5 773 -#define TRAINER_BRAWLY_2 774 -#define TRAINER_BRAWLY_3 775 -#define TRAINER_BRAWLY_4 776 -#define TRAINER_BRAWLY_5 777 -#define TRAINER_WATTSON_2 778 -#define TRAINER_WATTSON_3 779 -#define TRAINER_WATTSON_4 780 -#define TRAINER_WATTSON_5 781 -#define TRAINER_FLANNERY_2 782 -#define TRAINER_FLANNERY_3 783 -#define TRAINER_FLANNERY_4 784 -#define TRAINER_FLANNERY_5 785 -#define TRAINER_NORMAN_2 786 -#define TRAINER_NORMAN_3 787 -#define TRAINER_NORMAN_4 788 -#define TRAINER_NORMAN_5 789 -#define TRAINER_WINONA_2 790 -#define TRAINER_WINONA_3 791 -#define TRAINER_WINONA_4 792 -#define TRAINER_WINONA_5 793 -#define TRAINER_TATE_AND_LIZA_2 794 -#define TRAINER_TATE_AND_LIZA_3 795 -#define TRAINER_TATE_AND_LIZA_4 796 -#define TRAINER_TATE_AND_LIZA_5 797 -#define TRAINER_JUAN_2 798 -#define TRAINER_JUAN_3 799 -#define TRAINER_JUAN_4 800 -#define TRAINER_JUAN_5 801 -#define TRAINER_ANGELO 802 -#define TRAINER_DARIUS 803 -#define TRAINER_STEVEN 804 -#define TRAINER_ANABEL 805 -#define TRAINER_TUCKER 806 -#define TRAINER_SPENSER 807 -#define TRAINER_GRETA 808 -#define TRAINER_NOLAND 809 -#define TRAINER_LUCY 810 -#define TRAINER_BRANDON 811 -#define TRAINER_ANDRES_2 812 -#define TRAINER_ANDRES_3 813 -#define TRAINER_ANDRES_4 814 -#define TRAINER_ANDRES_5 815 -#define TRAINER_CORY_2 816 -#define TRAINER_CORY_3 817 -#define TRAINER_CORY_4 818 -#define TRAINER_CORY_5 819 -#define TRAINER_PABLO_2 820 -#define TRAINER_PABLO_3 821 -#define TRAINER_PABLO_4 822 -#define TRAINER_PABLO_5 823 -#define TRAINER_KOJI_2 824 -#define TRAINER_KOJI_3 825 -#define TRAINER_KOJI_4 826 -#define TRAINER_KOJI_5 827 -#define TRAINER_CRISTIN_2 828 -#define TRAINER_CRISTIN_3 829 -#define TRAINER_CRISTIN_4 830 -#define TRAINER_CRISTIN_5 831 -#define TRAINER_FERNANDO_2 832 -#define TRAINER_FERNANDO_3 833 -#define TRAINER_FERNANDO_4 834 -#define TRAINER_FERNANDO_5 835 -#define TRAINER_SAWYER_2 836 -#define TRAINER_SAWYER_3 837 -#define TRAINER_SAWYER_4 838 -#define TRAINER_SAWYER_5 839 -#define TRAINER_GABRIELLE_2 840 -#define TRAINER_GABRIELLE_3 841 -#define TRAINER_GABRIELLE_4 842 -#define TRAINER_GABRIELLE_5 843 -#define TRAINER_THALIA_2 844 -#define TRAINER_THALIA_3 845 -#define TRAINER_THALIA_4 846 -#define TRAINER_THALIA_5 847 -#define TRAINER_MARIELA 848 -#define TRAINER_ALVARO 849 -#define TRAINER_EVERETT 850 -#define TRAINER_RED 851 -#define TRAINER_LEAF 852 -#define TRAINER_BRENDAN_16 853 -#define TRAINER_MAY_16 854 - -#define TRAINERS_COUNT 855 +#include "constants/opponents.h" // Special Trainer Ids. #define TRAINER_FRONTIER_BRAIN 1022 -- cgit v1.2.3 From 07ea34e4c261f7e7b657435a087f7dff91d08ddd Mon Sep 17 00:00:00 2001 From: vblm12 Date: Fri, 20 Jul 2018 22:08:38 -0500 Subject: Make TrainerMonPtr fields const --- include/battle.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/battle.h b/include/battle.h index bd7ba4b35..f6c50ea8a 100644 --- a/include/battle.h +++ b/include/battle.h @@ -106,10 +106,10 @@ struct TrainerMonItemCustomMoves union TrainerMonPtr { - struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; - struct TrainerMonNoItemCustomMoves *NoItemCustomMoves; - struct TrainerMonItemDefaultMoves *ItemDefaultMoves; - struct TrainerMonItemCustomMoves *ItemCustomMoves; + const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; + const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves; + const struct TrainerMonItemDefaultMoves *ItemDefaultMoves; + const struct TrainerMonItemCustomMoves *ItemCustomMoves; }; struct Trainer -- cgit v1.2.3 From 29276cc76ce8632e0f2a3f25a84cc34567567e57 Mon Sep 17 00:00:00 2001 From: vblm12 Date: Fri, 20 Jul 2018 22:14:31 -0500 Subject: Move some trainer data from data2b.s to c structs. --- data/data2b.s | 232 - data/data2c.s | 226 + ld_script.txt | 2 + src/battle_data.c | 13 + src/data/text/move_names.h | 357 + src/data/text/species_names.h | 414 ++ src/data/text/trainer_class_names.h | 73 + src/data/trainer_parties.h | 12437 ++++++++++++++++++++++++++++++++++ src/data/trainers.h | 11971 ++++++++++++++++++++++++++++++++ 9 files changed, 25493 insertions(+), 232 deletions(-) create mode 100644 data/data2c.s create mode 100644 src/battle_data.c create mode 100644 src/data/text/move_names.h create mode 100644 src/data/text/species_names.h create mode 100644 src/data/text/trainer_class_names.h create mode 100644 src/data/trainer_parties.h create mode 100644 src/data/trainers.h diff --git a/data/data2b.s b/data/data2b.s index 87ca0b881..bf28d13d6 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4630,235 +4630,3 @@ gUnknown_08305D0C:: @ 8305D0C .4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888 .4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888 .4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888 - -@ 830B62C - .include "data/trainer_parties.inc" - -@ 830FCD4 - .include "data/text/trainer_class_names.inc" - -@ 8310030 - .include "data/trainers.inc" - -@ 83185C8 - .include "data/text/species_names.inc" - -@ 831977C - .include "data/text/move_names.inc" - -.align 2 - .2byte 0x0300, 0x0000 - - .align 2 -gUnknown_0831A988:: @ 831A988 - .byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0831A990:: @ 831A990 - .byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0831A998:: @ 831A998 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0831A9A8:: @ 831A9A8 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000 - .2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0831A9C8:: @ 831A9C8 - .4byte gUnknown_0831A998 - .4byte gUnknown_0831A9A8 - - .align 2 -gUnknown_0831A9D0:: @ 831A9D0 - spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17 - - .align 2 -gUnknown_0831A9E8:: @ 831A9E8 - spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17 - - .align 2 -gUnknown_0831AA00:: @ 831AA00 - obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710 - - .align 2 -gBattleBgTemplates:: @ 831AA08 - .4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab - - .align 2 -gUnknown_0831AA18:: @ 831AA18 - window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090 - window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0 - window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190 - window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300 - window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310 - window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320 - window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330 - window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290 - window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298 - window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298 - window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0 - window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0 - window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100 - window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100 - window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e - window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020 - window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040 - window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020 - window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040 - window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060 - window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080 - window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0 - window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0 - window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0 - null_window_template - - .align 2 -gUnknown_0831AAE0:: @ 831AAE0 - window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090 - window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0 - window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190 - window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300 - window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310 - window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320 - window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330 - window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290 - window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298 - window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298 - window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0 - window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0 - window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100 - window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100 - window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e - window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100 - window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110 - window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114 - window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124 - window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130 - window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c - window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148 - window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090 - null_window_template - - .align 2 -gBattleWindowTemplates:: @ 831ABA0 - .4byte gUnknown_0831AA18 - .4byte gUnknown_0831AAE0 - - .align 2 -gBattleTerrainTable:: @ 831ABA8 - @ tall_grass - .4byte gBattleTerrainTiles_TallGrass - .4byte gBattleTerrainTilemap_TallGrass - .4byte gBattleTerrainAnimTiles_TallGrass - .4byte gBattleTerrainAnimTilemap_TallGrass - .4byte gBattleTerrainPalette_TallGrass - - @ long_grass - .4byte gBattleTerrainTiles_LongGrass - .4byte gBattleTerrainTilemap_LongGrass - .4byte gBattleTerrainAnimTiles_LongGrass - .4byte gBattleTerrainAnimTilemap_LongGrass - .4byte gBattleTerrainPalette_LongGrass - - @ sand - .4byte gBattleTerrainTiles_Sand - .4byte gBattleTerrainTilemap_Sand - .4byte gBattleTerrainAnimTiles_Sand - .4byte gBattleTerrainAnimTilemap_Sand - .4byte gBattleTerrainPalette_Sand - - @ underwater - .4byte gBattleTerrainTiles_Underwater - .4byte gBattleTerrainTilemap_Underwater - .4byte gBattleTerrainAnimTiles_Underwater - .4byte gBattleTerrainAnimTilemap_Underwater - .4byte gBattleTerrainPalette_Underwater - - @ water - .4byte gBattleTerrainTiles_Water - .4byte gBattleTerrainTilemap_Water - .4byte gBattleTerrainAnimTiles_Water - .4byte gBattleTerrainAnimTilemap_Water - .4byte gBattleTerrainPalette_Water - - @ pond_water - .4byte gBattleTerrainTiles_PondWater - .4byte gBattleTerrainTilemap_PondWater - .4byte gBattleTerrainAnimTiles_PondWater - .4byte gBattleTerrainAnimTilemap_PondWater - .4byte gBattleTerrainPalette_PondWater - - @ rock - .4byte gBattleTerrainTiles_Rock - .4byte gBattleTerrainTilemap_Rock - .4byte gBattleTerrainAnimTiles_Rock - .4byte gBattleTerrainAnimTilemap_Rock - .4byte gBattleTerrainPalette_Rock - - @ cave - .4byte gBattleTerrainTiles_Cave - .4byte gBattleTerrainTilemap_Cave - .4byte gBattleTerrainAnimTiles_Cave - .4byte gBattleTerrainAnimTilemap_Cave - .4byte gBattleTerrainPalette_Cave - - @ building - .4byte gBattleTerrainTiles_Building - .4byte gBattleTerrainTilemap_Building - .4byte gBattleTerrainAnimTiles_Building - .4byte gBattleTerrainAnimTilemap_Building - .4byte gBattleTerrainPalette_Building - - @ plain - .4byte gBattleTerrainTiles_Building - .4byte gBattleTerrainTilemap_Building - .4byte gBattleTerrainAnimTiles_Building - .4byte gBattleTerrainAnimTilemap_Building - .4byte gBattleTerrainPalette_Plain - - .align 2 -gUnknown_0831AC70:: @ 831AC70 - .4byte REG_BG3HOFS - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - .4byte REG_BG3HOFS - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - - .align 2 -gUnknown_0831AC88:: @ 831AC88 - spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528 - -gText_ShedinjaJapaneseName:: @ 831ACA0 - .string "ヌケニン$" @ Nukenin - - .align 2 -gUnknown_0831ACA8:: @ 831ACA8 - .2byte 0x0100 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gUnknown_0831ACB0:: @ 831ACB0 - .2byte 0x0100 - .2byte 0xC000 - .2byte 0x2800 - - .align 2 -gUnknown_0831ACB8:: @ 831ACB8 - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0831ACC0:: @ 831ACC0 - .4byte gUnknown_0831ACB8 - - .align 2 -gUnknown_0831ACC4:: @ 831ACC4 - .2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_0831ACDC:: @ 831ACDC - .4byte gUnknown_0831ACC4 diff --git a/data/data2c.s b/data/data2c.s new file mode 100644 index 000000000..a661dc165 --- /dev/null +++ b/data/data2c.s @@ -0,0 +1,226 @@ +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" +#include "constants/trainers.h" +#include "constants/pokemon.h" + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 + .2byte 0x0300, 0x0000 + + .align 2 +gUnknown_0831A988:: @ 831A988 + .byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_0831A990:: @ 831A990 + .byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_0831A998:: @ 831A998 + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_0831A9A8:: @ 831A9A8 + .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000 + .2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_0831A9C8:: @ 831A9C8 + .4byte gUnknown_0831A998 + .4byte gUnknown_0831A9A8 + + .align 2 +gUnknown_0831A9D0:: @ 831A9D0 + spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17 + + .align 2 +gUnknown_0831A9E8:: @ 831A9E8 + spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17 + + .align 2 +gUnknown_0831AA00:: @ 831AA00 + obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710 + + .align 2 +gBattleBgTemplates:: @ 831AA08 + .4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab + + .align 2 +gUnknown_0831AA18:: @ 831AA18 + window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090 + window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0 + window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190 + window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300 + window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310 + window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320 + window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330 + window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290 + window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298 + window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298 + window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0 + window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0 + window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100 + window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100 + window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e + window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020 + window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040 + window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020 + window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040 + window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060 + window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080 + window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0 + window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0 + window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0 + null_window_template + + .align 2 +gUnknown_0831AAE0:: @ 831AAE0 + window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090 + window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0 + window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190 + window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300 + window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310 + window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320 + window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330 + window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290 + window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298 + window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298 + window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0 + window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0 + window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100 + window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100 + window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e + window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100 + window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110 + window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114 + window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124 + window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130 + window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c + window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148 + window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090 + null_window_template + + .align 2 +gBattleWindowTemplates:: @ 831ABA0 + .4byte gUnknown_0831AA18 + .4byte gUnknown_0831AAE0 + + .align 2 +gBattleTerrainTable:: @ 831ABA8 + @ tall_grass + .4byte gBattleTerrainTiles_TallGrass + .4byte gBattleTerrainTilemap_TallGrass + .4byte gBattleTerrainAnimTiles_TallGrass + .4byte gBattleTerrainAnimTilemap_TallGrass + .4byte gBattleTerrainPalette_TallGrass + + @ long_grass + .4byte gBattleTerrainTiles_LongGrass + .4byte gBattleTerrainTilemap_LongGrass + .4byte gBattleTerrainAnimTiles_LongGrass + .4byte gBattleTerrainAnimTilemap_LongGrass + .4byte gBattleTerrainPalette_LongGrass + + @ sand + .4byte gBattleTerrainTiles_Sand + .4byte gBattleTerrainTilemap_Sand + .4byte gBattleTerrainAnimTiles_Sand + .4byte gBattleTerrainAnimTilemap_Sand + .4byte gBattleTerrainPalette_Sand + + @ underwater + .4byte gBattleTerrainTiles_Underwater + .4byte gBattleTerrainTilemap_Underwater + .4byte gBattleTerrainAnimTiles_Underwater + .4byte gBattleTerrainAnimTilemap_Underwater + .4byte gBattleTerrainPalette_Underwater + + @ water + .4byte gBattleTerrainTiles_Water + .4byte gBattleTerrainTilemap_Water + .4byte gBattleTerrainAnimTiles_Water + .4byte gBattleTerrainAnimTilemap_Water + .4byte gBattleTerrainPalette_Water + + @ pond_water + .4byte gBattleTerrainTiles_PondWater + .4byte gBattleTerrainTilemap_PondWater + .4byte gBattleTerrainAnimTiles_PondWater + .4byte gBattleTerrainAnimTilemap_PondWater + .4byte gBattleTerrainPalette_PondWater + + @ rock + .4byte gBattleTerrainTiles_Rock + .4byte gBattleTerrainTilemap_Rock + .4byte gBattleTerrainAnimTiles_Rock + .4byte gBattleTerrainAnimTilemap_Rock + .4byte gBattleTerrainPalette_Rock + + @ cave + .4byte gBattleTerrainTiles_Cave + .4byte gBattleTerrainTilemap_Cave + .4byte gBattleTerrainAnimTiles_Cave + .4byte gBattleTerrainAnimTilemap_Cave + .4byte gBattleTerrainPalette_Cave + + @ building + .4byte gBattleTerrainTiles_Building + .4byte gBattleTerrainTilemap_Building + .4byte gBattleTerrainAnimTiles_Building + .4byte gBattleTerrainAnimTilemap_Building + .4byte gBattleTerrainPalette_Building + + @ plain + .4byte gBattleTerrainTiles_Building + .4byte gBattleTerrainTilemap_Building + .4byte gBattleTerrainAnimTiles_Building + .4byte gBattleTerrainAnimTilemap_Building + .4byte gBattleTerrainPalette_Plain + + .align 2 +gUnknown_0831AC70:: @ 831AC70 + .4byte REG_BG3HOFS + .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 + .4byte 1 + .4byte REG_BG3HOFS + .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 + .4byte 1 + + .align 2 +gUnknown_0831AC88:: @ 831AC88 + spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528 + +gText_ShedinjaJapaneseName:: @ 831ACA0 + .string "ヌケニン$" @ Nukenin + + .align 2 +gUnknown_0831ACA8:: @ 831ACA8 + .2byte 0x0100 + .2byte 0xC000 + .2byte 0x0800 + + .align 2 +gUnknown_0831ACB0:: @ 831ACB0 + .2byte 0x0100 + .2byte 0xC000 + .2byte 0x2800 + + .align 2 +gUnknown_0831ACB8:: @ 831ACB8 + .2byte 0x0000, 0x0005, 0xfffe, 0x0000 + + .align 2 +gUnknown_0831ACC0:: @ 831ACC0 + .4byte gUnknown_0831ACB8 + + .align 2 +gUnknown_0831ACC4:: @ 831ACC4 + .2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 + + .align 2 +gUnknown_0831ACDC:: @ 831ACDC + .4byte gUnknown_0831ACC4 diff --git a/ld_script.txt b/ld_script.txt index 6d5e31a25..f25d252a9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -371,6 +371,8 @@ SECTIONS { src/main_menu.o(.rodata); src/rom_8034C54.o(.rodata); data/data2b.o(.rodata); + src/battle_data.o(.rodata); + data/data2c.o(.rodata); src/battle_main.o(.rodata); src/battle_util.o(.rodata); src/battle_script_commands.o(.rodata); diff --git a/src/battle_data.c b/src/battle_data.c new file mode 100644 index 000000000..f3719ac2d --- /dev/null +++ b/src/battle_data.c @@ -0,0 +1,13 @@ +#include "global.h" +#include "battle.h" +#include "data2.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" +#include "constants/trainers.h" + +#include "data/trainer_parties.h" +#include "data/text/trainer_class_names.h" +#include "data/trainers.h" +#include "data/text/species_names.h" +#include "data/text/move_names.h" diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h new file mode 100644 index 000000000..3df7c886b --- /dev/null +++ b/src/data/text/move_names.h @@ -0,0 +1,357 @@ +const u8 gMoveNames[][13] = { + [MOVE_NONE] = _("-"), + [MOVE_POUND] = _("POUND"), + [MOVE_KARATE_CHOP] = _("KARATE CHOP"), + [MOVE_DOUBLE_SLAP] = _("DOUBLESLAP"), + [MOVE_COMET_PUNCH] = _("COMET PUNCH"), + [MOVE_MEGA_PUNCH] = _("MEGA PUNCH"), + [MOVE_PAY_DAY] = _("PAY DAY"), + [MOVE_FIRE_PUNCH] = _("FIRE PUNCH"), + [MOVE_ICE_PUNCH] = _("ICE PUNCH"), + [MOVE_THUNDER_PUNCH] = _("THUNDERPUNCH"), + [MOVE_SCRATCH] = _("SCRATCH"), + [MOVE_VICE_GRIP] = _("VICEGRIP"), + [MOVE_GUILLOTINE] = _("GUILLOTINE"), + [MOVE_RAZOR_WIND] = _("RAZOR WIND"), + [MOVE_SWORDS_DANCE] = _("SWORDS DANCE"), + [MOVE_CUT] = _("CUT"), + [MOVE_GUST] = _("GUST"), + [MOVE_WING_ATTACK] = _("WING ATTACK"), + [MOVE_WHIRLWIND] = _("WHIRLWIND"), + [MOVE_FLY] = _("FLY"), + [MOVE_BIND] = _("BIND"), + [MOVE_SLAM] = _("SLAM"), + [MOVE_VINE_WHIP] = _("VINE WHIP"), + [MOVE_STOMP] = _("STOMP"), + [MOVE_DOUBLE_KICK] = _("DOUBLE KICK"), + [MOVE_MEGA_KICK] = _("MEGA KICK"), + [MOVE_JUMP_KICK] = _("JUMP KICK"), + [MOVE_ROLLING_KICK] = _("ROLLING KICK"), + [MOVE_SAND_ATTACK] = _("SAND-ATTACK"), + [MOVE_HEADBUTT] = _("HEADBUTT"), + [MOVE_HORN_ATTACK] = _("HORN ATTACK"), + [MOVE_FURY_ATTACK] = _("FURY ATTACK"), + [MOVE_HORN_DRILL] = _("HORN DRILL"), + [MOVE_TACKLE] = _("TACKLE"), + [MOVE_BODY_SLAM] = _("BODY SLAM"), + [MOVE_WRAP] = _("WRAP"), + [MOVE_TAKE_DOWN] = _("TAKE DOWN"), + [MOVE_THRASH] = _("THRASH"), + [MOVE_DOUBLE_EDGE] = _("DOUBLE-EDGE"), + [MOVE_TAIL_WHIP] = _("TAIL WHIP"), + [MOVE_POISON_STING] = _("POISON STING"), + [MOVE_TWINEEDLE] = _("TWINEEDLE"), + [MOVE_PIN_MISSILE] = _("PIN MISSILE"), + [MOVE_LEER] = _("LEER"), + [MOVE_BITE] = _("BITE"), + [MOVE_GROWL] = _("GROWL"), + [MOVE_ROAR] = _("ROAR"), + [MOVE_SING] = _("SING"), + [MOVE_SUPERSONIC] = _("SUPERSONIC"), + [MOVE_SONIC_BOOM] = _("SONICBOOM"), + [MOVE_DISABLE] = _("DISABLE"), + [MOVE_ACID] = _("ACID"), + [MOVE_EMBER] = _("EMBER"), + [MOVE_FLAMETHROWER] = _("FLAMETHROWER"), + [MOVE_MIST] = _("MIST"), + [MOVE_WATER_GUN] = _("WATER GUN"), + [MOVE_HYDRO_PUMP] = _("HYDRO PUMP"), + [MOVE_SURF] = _("SURF"), + [MOVE_ICE_BEAM] = _("ICE BEAM"), + [MOVE_BLIZZARD] = _("BLIZZARD"), + [MOVE_PSYBEAM] = _("PSYBEAM"), + [MOVE_BUBBLE_BEAM] = _("BUBBLEBEAM"), + [MOVE_AURORA_BEAM] = _("AURORA BEAM"), + [MOVE_HYPER_BEAM] = _("HYPER BEAM"), + [MOVE_PECK] = _("PECK"), + [MOVE_DRILL_PECK] = _("DRILL PECK"), + [MOVE_SUBMISSION] = _("SUBMISSION"), + [MOVE_LOW_KICK] = _("LOW KICK"), + [MOVE_COUNTER] = _("COUNTER"), + [MOVE_SEISMIC_TOSS] = _("SEISMIC TOSS"), + [MOVE_STRENGTH] = _("STRENGTH"), + [MOVE_ABSORB] = _("ABSORB"), + [MOVE_MEGA_DRAIN] = _("MEGA DRAIN"), + [MOVE_LEECH_SEED] = _("LEECH SEED"), + [MOVE_GROWTH] = _("GROWTH"), + [MOVE_RAZOR_LEAF] = _("RAZOR LEAF"), + [MOVE_SOLAR_BEAM] = _("SOLARBEAM"), + [MOVE_POISON_POWDER] = _("POISONPOWDER"), + [MOVE_STUN_SPORE] = _("STUN SPORE"), + [MOVE_SLEEP_POWDER] = _("SLEEP POWDER"), + [MOVE_PETAL_DANCE] = _("PETAL DANCE"), + [MOVE_STRING_SHOT] = _("STRING SHOT"), + [MOVE_DRAGON_RAGE] = _("DRAGON RAGE"), + [MOVE_FIRE_SPIN] = _("FIRE SPIN"), + [MOVE_THUNDER_SHOCK] = _("THUNDERSHOCK"), + [MOVE_THUNDERBOLT] = _("THUNDERBOLT"), + [MOVE_THUNDER_WAVE] = _("THUNDER WAVE"), + [MOVE_THUNDER] = _("THUNDER"), + [MOVE_ROCK_THROW] = _("ROCK THROW"), + [MOVE_EARTHQUAKE] = _("EARTHQUAKE"), + [MOVE_FISSURE] = _("FISSURE"), + [MOVE_DIG] = _("DIG"), + [MOVE_TOXIC] = _("TOXIC"), + [MOVE_CONFUSION] = _("CONFUSION"), + [MOVE_PSYCHIC] = _("PSYCHIC"), + [MOVE_HYPNOSIS] = _("HYPNOSIS"), + [MOVE_MEDITATE] = _("MEDITATE"), + [MOVE_AGILITY] = _("AGILITY"), + [MOVE_QUICK_ATTACK] = _("QUICK ATTACK"), + [MOVE_RAGE] = _("RAGE"), + [MOVE_TELEPORT] = _("TELEPORT"), + [MOVE_NIGHT_SHADE] = _("NIGHT SHADE"), + [MOVE_MIMIC] = _("MIMIC"), + [MOVE_SCREECH] = _("SCREECH"), + [MOVE_DOUBLE_TEAM] = _("DOUBLE TEAM"), + [MOVE_RECOVER] = _("RECOVER"), + [MOVE_HARDEN] = _("HARDEN"), + [MOVE_MINIMIZE] = _("MINIMIZE"), + [MOVE_SMOKESCREEN] = _("SMOKESCREEN"), + [MOVE_CONFUSE_RAY] = _("CONFUSE RAY"), + [MOVE_WITHDRAW] = _("WITHDRAW"), + [MOVE_DEFENSE_CURL] = _("DEFENSE CURL"), + [MOVE_BARRIER] = _("BARRIER"), + [MOVE_LIGHT_SCREEN] = _("LIGHT SCREEN"), + [MOVE_HAZE] = _("HAZE"), + [MOVE_REFLECT] = _("REFLECT"), + [MOVE_FOCUS_ENERGY] = _("FOCUS ENERGY"), + [MOVE_BIDE] = _("BIDE"), + [MOVE_METRONOME] = _("METRONOME"), + [MOVE_MIRROR_MOVE] = _("MIRROR MOVE"), + [MOVE_SELF_DESTRUCT] = _("SELFDESTRUCT"), + [MOVE_EGG_BOMB] = _("EGG BOMB"), + [MOVE_LICK] = _("LICK"), + [MOVE_SMOG] = _("SMOG"), + [MOVE_SLUDGE] = _("SLUDGE"), + [MOVE_BONE_CLUB] = _("BONE CLUB"), + [MOVE_FIRE_BLAST] = _("FIRE BLAST"), + [MOVE_WATERFALL] = _("WATERFALL"), + [MOVE_CLAMP] = _("CLAMP"), + [MOVE_SWIFT] = _("SWIFT"), + [MOVE_SKULL_BASH] = _("SKULL BASH"), + [MOVE_SPIKE_CANNON] = _("SPIKE CANNON"), + [MOVE_CONSTRICT] = _("CONSTRICT"), + [MOVE_AMNESIA] = _("AMNESIA"), + [MOVE_KINESIS] = _("KINESIS"), + [MOVE_SOFT_BOILED] = _("SOFTBOILED"), + [MOVE_HI_JUMP_KICK] = _("HI JUMP KICK"), + [MOVE_GLARE] = _("GLARE"), + [MOVE_DREAM_EATER] = _("DREAM EATER"), + [MOVE_POISON_GAS] = _("POISON GAS"), + [MOVE_BARRAGE] = _("BARRAGE"), + [MOVE_LEECH_LIFE] = _("LEECH LIFE"), + [MOVE_LOVELY_KISS] = _("LOVELY KISS"), + [MOVE_SKY_ATTACK] = _("SKY ATTACK"), + [MOVE_TRANSFORM] = _("TRANSFORM"), + [MOVE_BUBBLE] = _("BUBBLE"), + [MOVE_DIZZY_PUNCH] = _("DIZZY PUNCH"), + [MOVE_SPORE] = _("SPORE"), + [MOVE_FLASH] = _("FLASH"), + [MOVE_PSYWAVE] = _("PSYWAVE"), + [MOVE_SPLASH] = _("SPLASH"), + [MOVE_ACID_ARMOR] = _("ACID ARMOR"), + [MOVE_CRABHAMMER] = _("CRABHAMMER"), + [MOVE_EXPLOSION] = _("EXPLOSION"), + [MOVE_FURY_SWIPES] = _("FURY SWIPES"), + [MOVE_BONEMERANG] = _("BONEMERANG"), + [MOVE_REST] = _("REST"), + [MOVE_ROCK_SLIDE] = _("ROCK SLIDE"), + [MOVE_HYPER_FANG] = _("HYPER FANG"), + [MOVE_SHARPEN] = _("SHARPEN"), + [MOVE_CONVERSION] = _("CONVERSION"), + [MOVE_TRI_ATTACK] = _("TRI ATTACK"), + [MOVE_SUPER_FANG] = _("SUPER FANG"), + [MOVE_SLASH] = _("SLASH"), + [MOVE_SUBSTITUTE] = _("SUBSTITUTE"), + [MOVE_STRUGGLE] = _("STRUGGLE"), + [MOVE_SKETCH] = _("SKETCH"), + [MOVE_TRIPLE_KICK] = _("TRIPLE KICK"), + [MOVE_THIEF] = _("THIEF"), + [MOVE_SPIDER_WEB] = _("SPIDER WEB"), + [MOVE_MIND_READER] = _("MIND READER"), + [MOVE_NIGHTMARE] = _("NIGHTMARE"), + [MOVE_FLAME_WHEEL] = _("FLAME WHEEL"), + [MOVE_SNORE] = _("SNORE"), + [MOVE_CURSE] = _("CURSE"), + [MOVE_FLAIL] = _("FLAIL"), + [MOVE_CONVERSION_2] = _("CONVERSION 2"), + [MOVE_AEROBLAST] = _("AEROBLAST"), + [MOVE_COTTON_SPORE] = _("COTTON SPORE"), + [MOVE_REVERSAL] = _("REVERSAL"), + [MOVE_SPITE] = _("SPITE"), + [MOVE_POWDER_SNOW] = _("POWDER SNOW"), + [MOVE_PROTECT] = _("PROTECT"), + [MOVE_MACH_PUNCH] = _("MACH PUNCH"), + [MOVE_SCARY_FACE] = _("SCARY FACE"), + [MOVE_FAINT_ATTACK] = _("FAINT ATTACK"), + [MOVE_SWEET_KISS] = _("SWEET KISS"), + [MOVE_BELLY_DRUM] = _("BELLY DRUM"), + [MOVE_SLUDGE_BOMB] = _("SLUDGE BOMB"), + [MOVE_MUD_SLAP] = _("MUD-SLAP"), + [MOVE_OCTAZOOKA] = _("OCTAZOOKA"), + [MOVE_SPIKES] = _("SPIKES"), + [MOVE_ZAP_CANNON] = _("ZAP CANNON"), + [MOVE_FORESIGHT] = _("FORESIGHT"), + [MOVE_DESTINY_BOND] = _("DESTINY BOND"), + [MOVE_PERISH_SONG] = _("PERISH SONG"), + [MOVE_ICY_WIND] = _("ICY WIND"), + [MOVE_DETECT] = _("DETECT"), + [MOVE_BONE_RUSH] = _("BONE RUSH"), + [MOVE_LOCK_ON] = _("LOCK-ON"), + [MOVE_OUTRAGE] = _("OUTRAGE"), + [MOVE_SANDSTORM] = _("SANDSTORM"), + [MOVE_GIGA_DRAIN] = _("GIGA DRAIN"), + [MOVE_ENDURE] = _("ENDURE"), + [MOVE_CHARM] = _("CHARM"), + [MOVE_ROLLOUT] = _("ROLLOUT"), + [MOVE_FALSE_SWIPE] = _("FALSE SWIPE"), + [MOVE_SWAGGER] = _("SWAGGER"), + [MOVE_MILK_DRINK] = _("MILK DRINK"), + [MOVE_SPARK] = _("SPARK"), + [MOVE_FURY_CUTTER] = _("FURY CUTTER"), + [MOVE_STEEL_WING] = _("STEEL WING"), + [MOVE_MEAN_LOOK] = _("MEAN LOOK"), + [MOVE_ATTRACT] = _("ATTRACT"), + [MOVE_SLEEP_TALK] = _("SLEEP TALK"), + [MOVE_HEAL_BELL] = _("HEAL BELL"), + [MOVE_RETURN] = _("RETURN"), + [MOVE_PRESENT] = _("PRESENT"), + [MOVE_FRUSTRATION] = _("FRUSTRATION"), + [MOVE_SAFEGUARD] = _("SAFEGUARD"), + [MOVE_PAIN_SPLIT] = _("PAIN SPLIT"), + [MOVE_SACRED_FIRE] = _("SACRED FIRE"), + [MOVE_MAGNITUDE] = _("MAGNITUDE"), + [MOVE_DYNAMIC_PUNCH] = _("DYNAMICPUNCH"), + [MOVE_MEGAHORN] = _("MEGAHORN"), + [MOVE_DRAGON_BREATH] = _("DRAGONBREATH"), + [MOVE_BATON_PASS] = _("BATON PASS"), + [MOVE_ENCORE] = _("ENCORE"), + [MOVE_PURSUIT] = _("PURSUIT"), + [MOVE_RAPID_SPIN] = _("RAPID SPIN"), + [MOVE_SWEET_SCENT] = _("SWEET SCENT"), + [MOVE_IRON_TAIL] = _("IRON TAIL"), + [MOVE_METAL_CLAW] = _("METAL CLAW"), + [MOVE_VITAL_THROW] = _("VITAL THROW"), + [MOVE_MORNING_SUN] = _("MORNING SUN"), + [MOVE_SYNTHESIS] = _("SYNTHESIS"), + [MOVE_MOONLIGHT] = _("MOONLIGHT"), + [MOVE_HIDDEN_POWER] = _("HIDDEN POWER"), + [MOVE_CROSS_CHOP] = _("CROSS CHOP"), + [MOVE_TWISTER] = _("TWISTER"), + [MOVE_RAIN_DANCE] = _("RAIN DANCE"), + [MOVE_SUNNY_DAY] = _("SUNNY DAY"), + [MOVE_CRUNCH] = _("CRUNCH"), + [MOVE_MIRROR_COAT] = _("MIRROR COAT"), + [MOVE_PSYCH_UP] = _("PSYCH UP"), + [MOVE_EXTREME_SPEED] = _("EXTREMESPEED"), + [MOVE_ANCIENT_POWER] = _("ANCIENTPOWER"), + [MOVE_SHADOW_BALL] = _("SHADOW BALL"), + [MOVE_FUTURE_SIGHT] = _("FUTURE SIGHT"), + [MOVE_ROCK_SMASH] = _("ROCK SMASH"), + [MOVE_WHIRLPOOL] = _("WHIRLPOOL"), + [MOVE_BEAT_UP] = _("BEAT UP"), + [MOVE_FAKE_OUT] = _("FAKE OUT"), + [MOVE_UPROAR] = _("UPROAR"), + [MOVE_STOCKPILE] = _("STOCKPILE"), + [MOVE_SPIT_UP] = _("SPIT UP"), + [MOVE_SWALLOW] = _("SWALLOW"), + [MOVE_HEAT_WAVE] = _("HEAT WAVE"), + [MOVE_HAIL] = _("HAIL"), + [MOVE_TORMENT] = _("TORMENT"), + [MOVE_FLATTER] = _("FLATTER"), + [MOVE_WILL_O_WISP] = _("WILL-O-WISP"), + [MOVE_MEMENTO] = _("MEMENTO"), + [MOVE_FACADE] = _("FACADE"), + [MOVE_FOCUS_PUNCH] = _("FOCUS PUNCH"), + [MOVE_SMELLING_SALT] = _("SMELLINGSALT"), + [MOVE_FOLLOW_ME] = _("FOLLOW ME"), + [MOVE_NATURE_POWER] = _("NATURE POWER"), + [MOVE_CHARGE] = _("CHARGE"), + [MOVE_TAUNT] = _("TAUNT"), + [MOVE_HELPING_HAND] = _("HELPING HAND"), + [MOVE_TRICK] = _("TRICK"), + [MOVE_ROLE_PLAY] = _("ROLE PLAY"), + [MOVE_WISH] = _("WISH"), + [MOVE_ASSIST] = _("ASSIST"), + [MOVE_INGRAIN] = _("INGRAIN"), + [MOVE_SUPERPOWER] = _("SUPERPOWER"), + [MOVE_MAGIC_COAT] = _("MAGIC COAT"), + [MOVE_RECYCLE] = _("RECYCLE"), + [MOVE_REVENGE] = _("REVENGE"), + [MOVE_BRICK_BREAK] = _("BRICK BREAK"), + [MOVE_YAWN] = _("YAWN"), + [MOVE_KNOCK_OFF] = _("KNOCK OFF"), + [MOVE_ENDEAVOR] = _("ENDEAVOR"), + [MOVE_ERUPTION] = _("ERUPTION"), + [MOVE_SKILL_SWAP] = _("SKILL SWAP"), + [MOVE_IMPRISON] = _("IMPRISON"), + [MOVE_REFRESH] = _("REFRESH"), + [MOVE_GRUDGE] = _("GRUDGE"), + [MOVE_SNATCH] = _("SNATCH"), + [MOVE_SECRET_POWER] = _("SECRET POWER"), + [MOVE_DIVE] = _("DIVE"), + [MOVE_ARM_THRUST] = _("ARM THRUST"), + [MOVE_CAMOUFLAGE] = _("CAMOUFLAGE"), + [MOVE_TAIL_GLOW] = _("TAIL GLOW"), + [MOVE_LUSTER_PURGE] = _("LUSTER PURGE"), + [MOVE_MIST_BALL] = _("MIST BALL"), + [MOVE_FEATHER_DANCE] = _("FEATHERDANCE"), + [MOVE_TEETER_DANCE] = _("TEETER DANCE"), + [MOVE_BLAZE_KICK] = _("BLAZE KICK"), + [MOVE_MUD_SPORT] = _("MUD SPORT"), + [MOVE_ICE_BALL] = _("ICE BALL"), + [MOVE_NEEDLE_ARM] = _("NEEDLE ARM"), + [MOVE_SLACK_OFF] = _("SLACK OFF"), + [MOVE_HYPER_VOICE] = _("HYPER VOICE"), + [MOVE_POISON_FANG] = _("POISON FANG"), + [MOVE_CRUSH_CLAW] = _("CRUSH CLAW"), + [MOVE_BLAST_BURN] = _("BLAST BURN"), + [MOVE_HYDRO_CANNON] = _("HYDRO CANNON"), + [MOVE_METEOR_MASH] = _("METEOR MASH"), + [MOVE_ASTONISH] = _("ASTONISH"), + [MOVE_WEATHER_BALL] = _("WEATHER BALL"), + [MOVE_AROMATHERAPY] = _("AROMATHERAPY"), + [MOVE_FAKE_TEARS] = _("FAKE TEARS"), + [MOVE_AIR_CUTTER] = _("AIR CUTTER"), + [MOVE_OVERHEAT] = _("OVERHEAT"), + [MOVE_ODOR_SLEUTH] = _("ODOR SLEUTH"), + [MOVE_ROCK_TOMB] = _("ROCK TOMB"), + [MOVE_SILVER_WIND] = _("SILVER WIND"), + [MOVE_METAL_SOUND] = _("METAL SOUND"), + [MOVE_GRASS_WHISTLE] = _("GRASSWHISTLE"), + [MOVE_TICKLE] = _("TICKLE"), + [MOVE_COSMIC_POWER] = _("COSMIC POWER"), + [MOVE_WATER_SPOUT] = _("WATER SPOUT"), + [MOVE_SIGNAL_BEAM] = _("SIGNAL BEAM"), + [MOVE_SHADOW_PUNCH] = _("SHADOW PUNCH"), + [MOVE_EXTRASENSORY] = _("EXTRASENSORY"), + [MOVE_SKY_UPPERCUT] = _("SKY UPPERCUT"), + [MOVE_SAND_TOMB] = _("SAND TOMB"), + [MOVE_SHEER_COLD] = _("SHEER COLD"), + [MOVE_MUDDY_WATER] = _("MUDDY WATER"), + [MOVE_BULLET_SEED] = _("BULLET SEED"), + [MOVE_AERIAL_ACE] = _("AERIAL ACE"), + [MOVE_ICICLE_SPEAR] = _("ICICLE SPEAR"), + [MOVE_IRON_DEFENSE] = _("IRON DEFENSE"), + [MOVE_BLOCK] = _("BLOCK"), + [MOVE_HOWL] = _("HOWL"), + [MOVE_DRAGON_CLAW] = _("DRAGON CLAW"), + [MOVE_FRENZY_PLANT] = _("FRENZY PLANT"), + [MOVE_BULK_UP] = _("BULK UP"), + [MOVE_BOUNCE] = _("BOUNCE"), + [MOVE_MUD_SHOT] = _("MUD SHOT"), + [MOVE_POISON_TAIL] = _("POISON TAIL"), + [MOVE_COVET] = _("COVET"), + [MOVE_VOLT_TACKLE] = _("VOLT TACKLE"), + [MOVE_MAGICAL_LEAF] = _("MAGICAL LEAF"), + [MOVE_WATER_SPORT] = _("WATER SPORT"), + [MOVE_CALM_MIND] = _("CALM MIND"), + [MOVE_LEAF_BLADE] = _("LEAF BLADE"), + [MOVE_DRAGON_DANCE] = _("DRAGON DANCE"), + [MOVE_ROCK_BLAST] = _("ROCK BLAST"), + [MOVE_SHOCK_WAVE] = _("SHOCK WAVE"), + [MOVE_WATER_PULSE] = _("WATER PULSE"), + [MOVE_DOOM_DESIRE] = _("DOOM DESIRE"), + [MOVE_PSYCHO_BOOST] = _("PSYCHO BOOST"), +}; diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h new file mode 100644 index 000000000..840beb22b --- /dev/null +++ b/src/data/text/species_names.h @@ -0,0 +1,414 @@ +const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { + [SPECIES_NONE] = _("??????????"), + [SPECIES_BULBASAUR] = _("BULBASAUR"), + [SPECIES_IVYSAUR] = _("IVYSAUR"), + [SPECIES_VENUSAUR] = _("VENUSAUR"), + [SPECIES_CHARMANDER] = _("CHARMANDER"), + [SPECIES_CHARMELEON] = _("CHARMELEON"), + [SPECIES_CHARIZARD] = _("CHARIZARD"), + [SPECIES_SQUIRTLE] = _("SQUIRTLE"), + [SPECIES_WARTORTLE] = _("WARTORTLE"), + [SPECIES_BLASTOISE] = _("BLASTOISE"), + [SPECIES_CATERPIE] = _("CATERPIE"), + [SPECIES_METAPOD] = _("METAPOD"), + [SPECIES_BUTTERFREE] = _("BUTTERFREE"), + [SPECIES_WEEDLE] = _("WEEDLE"), + [SPECIES_KAKUNA] = _("KAKUNA"), + [SPECIES_BEEDRILL] = _("BEEDRILL"), + [SPECIES_PIDGEY] = _("PIDGEY"), + [SPECIES_PIDGEOTTO] = _("PIDGEOTTO"), + [SPECIES_PIDGEOT] = _("PIDGEOT"), + [SPECIES_RATTATA] = _("RATTATA"), + [SPECIES_RATICATE] = _("RATICATE"), + [SPECIES_SPEAROW] = _("SPEAROW"), + [SPECIES_FEAROW] = _("FEAROW"), + [SPECIES_EKANS] = _("EKANS"), + [SPECIES_ARBOK] = _("ARBOK"), + [SPECIES_PIKACHU] = _("PIKACHU"), + [SPECIES_RAICHU] = _("RAICHU"), + [SPECIES_SANDSHREW] = _("SANDSHREW"), + [SPECIES_SANDSLASH] = _("SANDSLASH"), + [SPECIES_NIDORAN_F] = _("NIDORAN♀"), + [SPECIES_NIDORINA] = _("NIDORINA"), + [SPECIES_NIDOQUEEN] = _("NIDOQUEEN"), + [SPECIES_NIDORAN_M] = _("NIDORAN♂"), + [SPECIES_NIDORINO] = _("NIDORINO"), + [SPECIES_NIDOKING] = _("NIDOKING"), + [SPECIES_CLEFAIRY] = _("CLEFAIRY"), + [SPECIES_CLEFABLE] = _("CLEFABLE"), + [SPECIES_VULPIX] = _("VULPIX"), + [SPECIES_NINETALES] = _("NINETALES"), + [SPECIES_JIGGLYPUFF] = _("JIGGLYPUFF"), + [SPECIES_WIGGLYTUFF] = _("WIGGLYTUFF"), + [SPECIES_ZUBAT] = _("ZUBAT"), + [SPECIES_GOLBAT] = _("GOLBAT"), + [SPECIES_ODDISH] = _("ODDISH"), + [SPECIES_GLOOM] = _("GLOOM"), + [SPECIES_VILEPLUME] = _("VILEPLUME"), + [SPECIES_PARAS] = _("PARAS"), + [SPECIES_PARASECT] = _("PARASECT"), + [SPECIES_VENONAT] = _("VENONAT"), + [SPECIES_VENOMOTH] = _("VENOMOTH"), + [SPECIES_DIGLETT] = _("DIGLETT"), + [SPECIES_DUGTRIO] = _("DUGTRIO"), + [SPECIES_MEOWTH] = _("MEOWTH"), + [SPECIES_PERSIAN] = _("PERSIAN"), + [SPECIES_PSYDUCK] = _("PSYDUCK"), + [SPECIES_GOLDUCK] = _("GOLDUCK"), + [SPECIES_MANKEY] = _("MANKEY"), + [SPECIES_PRIMEAPE] = _("PRIMEAPE"), + [SPECIES_GROWLITHE] = _("GROWLITHE"), + [SPECIES_ARCANINE] = _("ARCANINE"), + [SPECIES_POLIWAG] = _("POLIWAG"), + [SPECIES_POLIWHIRL] = _("POLIWHIRL"), + [SPECIES_POLIWRATH] = _("POLIWRATH"), + [SPECIES_ABRA] = _("ABRA"), + [SPECIES_KADABRA] = _("KADABRA"), + [SPECIES_ALAKAZAM] = _("ALAKAZAM"), + [SPECIES_MACHOP] = _("MACHOP"), + [SPECIES_MACHOKE] = _("MACHOKE"), + [SPECIES_MACHAMP] = _("MACHAMP"), + [SPECIES_BELLSPROUT] = _("BELLSPROUT"), + [SPECIES_WEEPINBELL] = _("WEEPINBELL"), + [SPECIES_VICTREEBEL] = _("VICTREEBEL"), + [SPECIES_TENTACOOL] = _("TENTACOOL"), + [SPECIES_TENTACRUEL] = _("TENTACRUEL"), + [SPECIES_GEODUDE] = _("GEODUDE"), + [SPECIES_GRAVELER] = _("GRAVELER"), + [SPECIES_GOLEM] = _("GOLEM"), + [SPECIES_PONYTA] = _("PONYTA"), + [SPECIES_RAPIDASH] = _("RAPIDASH"), + [SPECIES_SLOWPOKE] = _("SLOWPOKE"), + [SPECIES_SLOWBRO] = _("SLOWBRO"), + [SPECIES_MAGNEMITE] = _("MAGNEMITE"), + [SPECIES_MAGNETON] = _("MAGNETON"), + [SPECIES_FARFETCHD] = _("FARFETCH’D"), + [SPECIES_DODUO] = _("DODUO"), + [SPECIES_DODRIO] = _("DODRIO"), + [SPECIES_SEEL] = _("SEEL"), + [SPECIES_DEWGONG] = _("DEWGONG"), + [SPECIES_GRIMER] = _("GRIMER"), + [SPECIES_MUK] = _("MUK"), + [SPECIES_SHELLDER] = _("SHELLDER"), + [SPECIES_CLOYSTER] = _("CLOYSTER"), + [SPECIES_GASTLY] = _("GASTLY"), + [SPECIES_HAUNTER] = _("HAUNTER"), + [SPECIES_GENGAR] = _("GENGAR"), + [SPECIES_ONIX] = _("ONIX"), + [SPECIES_DROWZEE] = _("DROWZEE"), + [SPECIES_HYPNO] = _("HYPNO"), + [SPECIES_KRABBY] = _("KRABBY"), + [SPECIES_KINGLER] = _("KINGLER"), + [SPECIES_VOLTORB] = _("VOLTORB"), + [SPECIES_ELECTRODE] = _("ELECTRODE"), + [SPECIES_EXEGGCUTE] = _("EXEGGCUTE"), + [SPECIES_EXEGGUTOR] = _("EXEGGUTOR"), + [SPECIES_CUBONE] = _("CUBONE"), + [SPECIES_MAROWAK] = _("MAROWAK"), + [SPECIES_HITMONLEE] = _("HITMONLEE"), + [SPECIES_HITMONCHAN] = _("HITMONCHAN"), + [SPECIES_LICKITUNG] = _("LICKITUNG"), + [SPECIES_KOFFING] = _("KOFFING"), + [SPECIES_WEEZING] = _("WEEZING"), + [SPECIES_RHYHORN] = _("RHYHORN"), + [SPECIES_RHYDON] = _("RHYDON"), + [SPECIES_CHANSEY] = _("CHANSEY"), + [SPECIES_TANGELA] = _("TANGELA"), + [SPECIES_KANGASKHAN] = _("KANGASKHAN"), + [SPECIES_HORSEA] = _("HORSEA"), + [SPECIES_SEADRA] = _("SEADRA"), + [SPECIES_GOLDEEN] = _("GOLDEEN"), + [SPECIES_SEAKING] = _("SEAKING"), + [SPECIES_STARYU] = _("STARYU"), + [SPECIES_STARMIE] = _("STARMIE"), + [SPECIES_MR_MIME] = _("MR. MIME"), + [SPECIES_SCYTHER] = _("SCYTHER"), + [SPECIES_JYNX] = _("JYNX"), + [SPECIES_ELECTABUZZ] = _("ELECTABUZZ"), + [SPECIES_MAGMAR] = _("MAGMAR"), + [SPECIES_PINSIR] = _("PINSIR"), + [SPECIES_TAUROS] = _("TAUROS"), + [SPECIES_MAGIKARP] = _("MAGIKARP"), + [SPECIES_GYARADOS] = _("GYARADOS"), + [SPECIES_LAPRAS] = _("LAPRAS"), + [SPECIES_DITTO] = _("DITTO"), + [SPECIES_EEVEE] = _("EEVEE"), + [SPECIES_VAPOREON] = _("VAPOREON"), + [SPECIES_JOLTEON] = _("JOLTEON"), + [SPECIES_FLAREON] = _("FLAREON"), + [SPECIES_PORYGON] = _("PORYGON"), + [SPECIES_OMANYTE] = _("OMANYTE"), + [SPECIES_OMASTAR] = _("OMASTAR"), + [SPECIES_KABUTO] = _("KABUTO"), + [SPECIES_KABUTOPS] = _("KABUTOPS"), + [SPECIES_AERODACTYL] = _("AERODACTYL"), + [SPECIES_SNORLAX] = _("SNORLAX"), + [SPECIES_ARTICUNO] = _("ARTICUNO"), + [SPECIES_ZAPDOS] = _("ZAPDOS"), + [SPECIES_MOLTRES] = _("MOLTRES"), + [SPECIES_DRATINI] = _("DRATINI"), + [SPECIES_DRAGONAIR] = _("DRAGONAIR"), + [SPECIES_DRAGONITE] = _("DRAGONITE"), + [SPECIES_MEWTWO] = _("MEWTWO"), + [SPECIES_MEW] = _("MEW"), + [SPECIES_CHIKORITA] = _("CHIKORITA"), + [SPECIES_BAYLEEF] = _("BAYLEEF"), + [SPECIES_MEGANIUM] = _("MEGANIUM"), + [SPECIES_CYNDAQUIL] = _("CYNDAQUIL"), + [SPECIES_QUILAVA] = _("QUILAVA"), + [SPECIES_TYPHLOSION] = _("TYPHLOSION"), + [SPECIES_TOTODILE] = _("TOTODILE"), + [SPECIES_CROCONAW] = _("CROCONAW"), + [SPECIES_FERALIGATR] = _("FERALIGATR"), + [SPECIES_SENTRET] = _("SENTRET"), + [SPECIES_FURRET] = _("FURRET"), + [SPECIES_HOOTHOOT] = _("HOOTHOOT"), + [SPECIES_NOCTOWL] = _("NOCTOWL"), + [SPECIES_LEDYBA] = _("LEDYBA"), + [SPECIES_LEDIAN] = _("LEDIAN"), + [SPECIES_SPINARAK] = _("SPINARAK"), + [SPECIES_ARIADOS] = _("ARIADOS"), + [SPECIES_CROBAT] = _("CROBAT"), + [SPECIES_CHINCHOU] = _("CHINCHOU"), + [SPECIES_LANTURN] = _("LANTURN"), + [SPECIES_PICHU] = _("PICHU"), + [SPECIES_CLEFFA] = _("CLEFFA"), + [SPECIES_IGGLYBUFF] = _("IGGLYBUFF"), + [SPECIES_TOGEPI] = _("TOGEPI"), + [SPECIES_TOGETIC] = _("TOGETIC"), + [SPECIES_NATU] = _("NATU"), + [SPECIES_XATU] = _("XATU"), + [SPECIES_MAREEP] = _("MAREEP"), + [SPECIES_FLAAFFY] = _("FLAAFFY"), + [SPECIES_AMPHAROS] = _("AMPHAROS"), + [SPECIES_BELLOSSOM] = _("BELLOSSOM"), + [SPECIES_MARILL] = _("MARILL"), + [SPECIES_AZUMARILL] = _("AZUMARILL"), + [SPECIES_SUDOWOODO] = _("SUDOWOODO"), + [SPECIES_POLITOED] = _("POLITOED"), + [SPECIES_HOPPIP] = _("HOPPIP"), + [SPECIES_SKIPLOOM] = _("SKIPLOOM"), + [SPECIES_JUMPLUFF] = _("JUMPLUFF"), + [SPECIES_AIPOM] = _("AIPOM"), + [SPECIES_SUNKERN] = _("SUNKERN"), + [SPECIES_SUNFLORA] = _("SUNFLORA"), + [SPECIES_YANMA] = _("YANMA"), + [SPECIES_WOOPER] = _("WOOPER"), + [SPECIES_QUAGSIRE] = _("QUAGSIRE"), + [SPECIES_ESPEON] = _("ESPEON"), + [SPECIES_UMBREON] = _("UMBREON"), + [SPECIES_MURKROW] = _("MURKROW"), + [SPECIES_SLOWKING] = _("SLOWKING"), + [SPECIES_MISDREAVUS] = _("MISDREAVUS"), + [SPECIES_UNOWN] = _("UNOWN"), + [SPECIES_WOBBUFFET] = _("WOBBUFFET"), + [SPECIES_GIRAFARIG] = _("GIRAFARIG"), + [SPECIES_PINECO] = _("PINECO"), + [SPECIES_FORRETRESS] = _("FORRETRESS"), + [SPECIES_DUNSPARCE] = _("DUNSPARCE"), + [SPECIES_GLIGAR] = _("GLIGAR"), + [SPECIES_STEELIX] = _("STEELIX"), + [SPECIES_SNUBBULL] = _("SNUBBULL"), + [SPECIES_GRANBULL] = _("GRANBULL"), + [SPECIES_QWILFISH] = _("QWILFISH"), + [SPECIES_SCIZOR] = _("SCIZOR"), + [SPECIES_SHUCKLE] = _("SHUCKLE"), + [SPECIES_HERACROSS] = _("HERACROSS"), + [SPECIES_SNEASEL] = _("SNEASEL"), + [SPECIES_TEDDIURSA] = _("TEDDIURSA"), + [SPECIES_URSARING] = _("URSARING"), + [SPECIES_SLUGMA] = _("SLUGMA"), + [SPECIES_MAGCARGO] = _("MAGCARGO"), + [SPECIES_SWINUB] = _("SWINUB"), + [SPECIES_PILOSWINE] = _("PILOSWINE"), + [SPECIES_CORSOLA] = _("CORSOLA"), + [SPECIES_REMORAID] = _("REMORAID"), + [SPECIES_OCTILLERY] = _("OCTILLERY"), + [SPECIES_DELIBIRD] = _("DELIBIRD"), + [SPECIES_MANTINE] = _("MANTINE"), + [SPECIES_SKARMORY] = _("SKARMORY"), + [SPECIES_HOUNDOUR] = _("HOUNDOUR"), + [SPECIES_HOUNDOOM] = _("HOUNDOOM"), + [SPECIES_KINGDRA] = _("KINGDRA"), + [SPECIES_PHANPY] = _("PHANPY"), + [SPECIES_DONPHAN] = _("DONPHAN"), + [SPECIES_PORYGON2] = _("PORYGON2"), + [SPECIES_STANTLER] = _("STANTLER"), + [SPECIES_SMEARGLE] = _("SMEARGLE"), + [SPECIES_TYROGUE] = _("TYROGUE"), + [SPECIES_HITMONTOP] = _("HITMONTOP"), + [SPECIES_SMOOCHUM] = _("SMOOCHUM"), + [SPECIES_ELEKID] = _("ELEKID"), + [SPECIES_MAGBY] = _("MAGBY"), + [SPECIES_MILTANK] = _("MILTANK"), + [SPECIES_BLISSEY] = _("BLISSEY"), + [SPECIES_RAIKOU] = _("RAIKOU"), + [SPECIES_ENTEI] = _("ENTEI"), + [SPECIES_SUICUNE] = _("SUICUNE"), + [SPECIES_LARVITAR] = _("LARVITAR"), + [SPECIES_PUPITAR] = _("PUPITAR"), + [SPECIES_TYRANITAR] = _("TYRANITAR"), + [SPECIES_LUGIA] = _("LUGIA"), + [SPECIES_HO_OH] = _("HO-OH"), + [SPECIES_CELEBI] = _("CELEBI"), + [SPECIES_OLD_UNOWN_B] = _("?"), + [SPECIES_OLD_UNOWN_C] = _("?"), + [SPECIES_OLD_UNOWN_D] = _("?"), + [SPECIES_OLD_UNOWN_E] = _("?"), + [SPECIES_OLD_UNOWN_F] = _("?"), + [SPECIES_OLD_UNOWN_G] = _("?"), + [SPECIES_OLD_UNOWN_H] = _("?"), + [SPECIES_OLD_UNOWN_I] = _("?"), + [SPECIES_OLD_UNOWN_J] = _("?"), + [SPECIES_OLD_UNOWN_K] = _("?"), + [SPECIES_OLD_UNOWN_L] = _("?"), + [SPECIES_OLD_UNOWN_M] = _("?"), + [SPECIES_OLD_UNOWN_N] = _("?"), + [SPECIES_OLD_UNOWN_O] = _("?"), + [SPECIES_OLD_UNOWN_P] = _("?"), + [SPECIES_OLD_UNOWN_Q] = _("?"), + [SPECIES_OLD_UNOWN_R] = _("?"), + [SPECIES_OLD_UNOWN_S] = _("?"), + [SPECIES_OLD_UNOWN_T] = _("?"), + [SPECIES_OLD_UNOWN_U] = _("?"), + [SPECIES_OLD_UNOWN_V] = _("?"), + [SPECIES_OLD_UNOWN_W] = _("?"), + [SPECIES_OLD_UNOWN_X] = _("?"), + [SPECIES_OLD_UNOWN_Y] = _("?"), + [SPECIES_OLD_UNOWN_Z] = _("?"), + [SPECIES_TREECKO] = _("TREECKO"), + [SPECIES_GROVYLE] = _("GROVYLE"), + [SPECIES_SCEPTILE] = _("SCEPTILE"), + [SPECIES_TORCHIC] = _("TORCHIC"), + [SPECIES_COMBUSKEN] = _("COMBUSKEN"), + [SPECIES_BLAZIKEN] = _("BLAZIKEN"), + [SPECIES_MUDKIP] = _("MUDKIP"), + [SPECIES_MARSHTOMP] = _("MARSHTOMP"), + [SPECIES_SWAMPERT] = _("SWAMPERT"), + [SPECIES_POOCHYENA] = _("POOCHYENA"), + [SPECIES_MIGHTYENA] = _("MIGHTYENA"), + [SPECIES_ZIGZAGOON] = _("ZIGZAGOON"), + [SPECIES_LINOONE] = _("LINOONE"), + [SPECIES_WURMPLE] = _("WURMPLE"), + [SPECIES_SILCOON] = _("SILCOON"), + [SPECIES_BEAUTIFLY] = _("BEAUTIFLY"), + [SPECIES_CASCOON] = _("CASCOON"), + [SPECIES_DUSTOX] = _("DUSTOX"), + [SPECIES_LOTAD] = _("LOTAD"), + [SPECIES_LOMBRE] = _("LOMBRE"), + [SPECIES_LUDICOLO] = _("LUDICOLO"), + [SPECIES_SEEDOT] = _("SEEDOT"), + [SPECIES_NUZLEAF] = _("NUZLEAF"), + [SPECIES_SHIFTRY] = _("SHIFTRY"), + [SPECIES_NINCADA] = _("NINCADA"), + [SPECIES_NINJASK] = _("NINJASK"), + [SPECIES_SHEDINJA] = _("SHEDINJA"), + [SPECIES_TAILLOW] = _("TAILLOW"), + [SPECIES_SWELLOW] = _("SWELLOW"), + [SPECIES_SHROOMISH] = _("SHROOMISH"), + [SPECIES_BRELOOM] = _("BRELOOM"), + [SPECIES_SPINDA] = _("SPINDA"), + [SPECIES_WINGULL] = _("WINGULL"), + [SPECIES_PELIPPER] = _("PELIPPER"), + [SPECIES_SURSKIT] = _("SURSKIT"), + [SPECIES_MASQUERAIN] = _("MASQUERAIN"), + [SPECIES_WAILMER] = _("WAILMER"), + [SPECIES_WAILORD] = _("WAILORD"), + [SPECIES_SKITTY] = _("SKITTY"), + [SPECIES_DELCATTY] = _("DELCATTY"), + [SPECIES_KECLEON] = _("KECLEON"), + [SPECIES_BALTOY] = _("BALTOY"), + [SPECIES_CLAYDOL] = _("CLAYDOL"), + [SPECIES_NOSEPASS] = _("NOSEPASS"), + [SPECIES_TORKOAL] = _("TORKOAL"), + [SPECIES_SABLEYE] = _("SABLEYE"), + [SPECIES_BARBOACH] = _("BARBOACH"), + [SPECIES_WHISCASH] = _("WHISCASH"), + [SPECIES_LUVDISC] = _("LUVDISC"), + [SPECIES_CORPHISH] = _("CORPHISH"), + [SPECIES_CRAWDAUNT] = _("CRAWDAUNT"), + [SPECIES_FEEBAS] = _("FEEBAS"), + [SPECIES_MILOTIC] = _("MILOTIC"), + [SPECIES_CARVANHA] = _("CARVANHA"), + [SPECIES_SHARPEDO] = _("SHARPEDO"), + [SPECIES_TRAPINCH] = _("TRAPINCH"), + [SPECIES_VIBRAVA] = _("VIBRAVA"), + [SPECIES_FLYGON] = _("FLYGON"), + [SPECIES_MAKUHITA] = _("MAKUHITA"), + [SPECIES_HARIYAMA] = _("HARIYAMA"), + [SPECIES_ELECTRIKE] = _("ELECTRIKE"), + [SPECIES_MANECTRIC] = _("MANECTRIC"), + [SPECIES_NUMEL] = _("NUMEL"), + [SPECIES_CAMERUPT] = _("CAMERUPT"), + [SPECIES_SPHEAL] = _("SPHEAL"), + [SPECIES_SEALEO] = _("SEALEO"), + [SPECIES_WALREIN] = _("WALREIN"), + [SPECIES_CACNEA] = _("CACNEA"), + [SPECIES_CACTURNE] = _("CACTURNE"), + [SPECIES_SNORUNT] = _("SNORUNT"), + [SPECIES_GLALIE] = _("GLALIE"), + [SPECIES_LUNATONE] = _("LUNATONE"), + [SPECIES_SOLROCK] = _("SOLROCK"), + [SPECIES_AZURILL] = _("AZURILL"), + [SPECIES_SPOINK] = _("SPOINK"), + [SPECIES_GRUMPIG] = _("GRUMPIG"), + [SPECIES_PLUSLE] = _("PLUSLE"), + [SPECIES_MINUN] = _("MINUN"), + [SPECIES_MAWILE] = _("MAWILE"), + [SPECIES_MEDITITE] = _("MEDITITE"), + [SPECIES_MEDICHAM] = _("MEDICHAM"), + [SPECIES_SWABLU] = _("SWABLU"), + [SPECIES_ALTARIA] = _("ALTARIA"), + [SPECIES_WYNAUT] = _("WYNAUT"), + [SPECIES_DUSKULL] = _("DUSKULL"), + [SPECIES_DUSCLOPS] = _("DUSCLOPS"), + [SPECIES_ROSELIA] = _("ROSELIA"), + [SPECIES_SLAKOTH] = _("SLAKOTH"), + [SPECIES_VIGOROTH] = _("VIGOROTH"), + [SPECIES_SLAKING] = _("SLAKING"), + [SPECIES_GULPIN] = _("GULPIN"), + [SPECIES_SWALOT] = _("SWALOT"), + [SPECIES_TROPIUS] = _("TROPIUS"), + [SPECIES_WHISMUR] = _("WHISMUR"), + [SPECIES_LOUDRED] = _("LOUDRED"), + [SPECIES_EXPLOUD] = _("EXPLOUD"), + [SPECIES_CLAMPERL] = _("CLAMPERL"), + [SPECIES_HUNTAIL] = _("HUNTAIL"), + [SPECIES_GOREBYSS] = _("GOREBYSS"), + [SPECIES_ABSOL] = _("ABSOL"), + [SPECIES_SHUPPET] = _("SHUPPET"), + [SPECIES_BANETTE] = _("BANETTE"), + [SPECIES_SEVIPER] = _("SEVIPER"), + [SPECIES_ZANGOOSE] = _("ZANGOOSE"), + [SPECIES_RELICANTH] = _("RELICANTH"), + [SPECIES_ARON] = _("ARON"), + [SPECIES_LAIRON] = _("LAIRON"), + [SPECIES_AGGRON] = _("AGGRON"), + [SPECIES_CASTFORM] = _("CASTFORM"), + [SPECIES_VOLBEAT] = _("VOLBEAT"), + [SPECIES_ILLUMISE] = _("ILLUMISE"), + [SPECIES_LILEEP] = _("LILEEP"), + [SPECIES_CRADILY] = _("CRADILY"), + [SPECIES_ANORITH] = _("ANORITH"), + [SPECIES_ARMALDO] = _("ARMALDO"), + [SPECIES_RALTS] = _("RALTS"), + [SPECIES_KIRLIA] = _("KIRLIA"), + [SPECIES_GARDEVOIR] = _("GARDEVOIR"), + [SPECIES_BAGON] = _("BAGON"), + [SPECIES_SHELGON] = _("SHELGON"), + [SPECIES_SALAMENCE] = _("SALAMENCE"), + [SPECIES_BELDUM] = _("BELDUM"), + [SPECIES_METANG] = _("METANG"), + [SPECIES_METAGROSS] = _("METAGROSS"), + [SPECIES_REGIROCK] = _("REGIROCK"), + [SPECIES_REGICE] = _("REGICE"), + [SPECIES_REGISTEEL] = _("REGISTEEL"), + [SPECIES_KYOGRE] = _("KYOGRE"), + [SPECIES_GROUDON] = _("GROUDON"), + [SPECIES_RAYQUAZA] = _("RAYQUAZA"), + [SPECIES_LATIAS] = _("LATIAS"), + [SPECIES_LATIOS] = _("LATIOS"), + [SPECIES_JIRACHI] = _("JIRACHI"), + [SPECIES_DEOXYS] = _("DEOXYS"), + [SPECIES_CHIMECHO] = _("CHIMECHO"), +}; diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h new file mode 100644 index 000000000..7a126a128 --- /dev/null +++ b/src/data/text/trainer_class_names.h @@ -0,0 +1,73 @@ +#ifndef GUARD_TRAINER_CLASS_NAMES_H +#define GUARD_TRAINER_CLASS_NAMES_H + +const u8 gTrainerClassNames[][13] = { + _("{PKMN} TRAINER"), + _("{PKMN} TRAINER"), + _("HIKER"), + _("TEAM AQUA"), + _("{PKMN} BREEDER"), + _("COOLTRAINER"), + _("BIRD KEEPER"), + _("COLLECTOR"), + _("SWIMMER♂"), + _("TEAM MAGMA"), + _("EXPERT"), + _("AQUA ADMIN"), + _("BLACK BELT"), + _("AQUA LEADER"), + _("HEX MANIAC"), + _("AROMA LADY"), + _("RUIN MANIAC"), + _("INTERVIEWER"), + _("TUBER"), + _("TUBER"), + _("LADY"), + _("BEAUTY"), + _("RICH BOY"), + _("POKéMANIAC"), + _("GUITARIST"), + _("KINDLER"), + _("CAMPER"), + _("PICNICKER"), + _("BUG MANIAC"), + _("PSYCHIC"), + _("GENTLEMAN"), + _("ELITE FOUR"), + _("LEADER"), + _("SCHOOL KID"), + _("SR. AND JR."), + _("WINSTRATE"), + _("POKéFAN"), + _("YOUNGSTER"), + _("CHAMPION"), + _("FISHERMAN"), + _("TRIATHLETE"), + _("DRAGON TAMER"), + _("NINJA BOY"), + _("BATTLE GIRL"), + _("PARASOL LADY"), + _("SWIMMER♀"), + _("TWINS"), + _("SAILOR"), + _("COOLTRAINER"), + _("MAGMA ADMIN"), + _("{PKMN} TRAINER"), + _("BUG CATCHER"), + _("{PKMN} RANGER"), + _("MAGMA LEADER"), + _("LASS"), + _("YOUNG COUPLE"), + _("OLD COUPLE"), + _("SIS AND BRO"), + _("SALON MAIDEN"), + _("DOME ACE"), + _("PALACE MAVEN"), + _("ARENA TYCOON"), + _("FACTORY HEAD"), + _("PIKE QUEEN"), + _("PYRAMID KING"), + _("{PKMN} TRAINER"), +}; + +#endif diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h new file mode 100644 index 000000000..4993186d2 --- /dev/null +++ b/src/data/trainer_parties.h @@ -0,0 +1,12437 @@ +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer1[] = { + { + .iv = 0, + .lvl = 21, + .species = SPECIES_GEODUDE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = { + { + .iv = 0, + .lvl = 36, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = { + { + .iv = 0, + .lvl = 36, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = { + { + .iv = 0, + .lvl = 36, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle1[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_LOTAD, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SEEDOT, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_TAILLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = { + { + .iv = 0, + .lvl = 9, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcel[] = { + { + .iv = 100, + .lvl = 29, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SHIFTRY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alberto[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_XATU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ed[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_ZANGOOSE, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SEVIPER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = { + { + .iv = 0, + .lvl = 36, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Declan[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = { + { + .iv = 0, + .lvl = 11, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = { + { + .iv = 0, + .lvl = 28, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fredrick[] = { + { + .iv = 100, + .lvl = 30, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 100, + .lvl = 30, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt[] = { + { + .iv = 50, + .lvl = 34, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 50, + .lvl = 34, + .species = SPECIES_GOLBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Zander[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = { + { + .iv = 50, + .lvl = 28, + .species = SPECIES_CARVANHA, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = { + { + .iv = 100, + .lvl = 37, + .species = SPECIES_SHARPEDO, + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie[] = { + { + .iv = 150, + .lvl = 41, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 41, + .species = SPECIES_CROBAT, + }, + { + .iv = 150, + .lvl = 43, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leah[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_SPOINK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Felix[] = { + { + .iv = 0, + .lvl = 43, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_CLAYDOL, + .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GLOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = { + { + .iv = 10, + .lvl = 26, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = { + { + .iv = 20, + .lvl = 28, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_GLOOM, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = { + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_GLOOM, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = { + { + .iv = 40, + .lvl = 34, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_GLOOM, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = { + { + .iv = 50, + .lvl = 23, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = { + { + .iv = 50, + .lvl = 27, + .species = SPECIES_BALTOY, + .moves = MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER + }, + { + .iv = 50, + .lvl = 27, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + }, + { + .iv = 50, + .lvl = 27, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = { + { + .iv = 100, + .lvl = 25, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + }, + { + .iv = 100, + .lvl = 25, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = { + { + .iv = 60, + .lvl = 27, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = { + { + .iv = 70, + .lvl = 30, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = { + { + .iv = 80, + .lvl = 33, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = { + { + .iv = 90, + .lvl = 36, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = { + { + .iv = 50, + .lvl = 17, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 50, + .lvl = 17, + .species = SPECIES_WHISMUR, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = { + { + .iv = 100, + .lvl = 27, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = { + { + .iv = 150, + .lvl = 30, + .species = SPECIES_MAGNETON, + }, + { + .iv = 150, + .lvl = 30, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = { + { + .iv = 200, + .lvl = 33, + .species = SPECIES_MAGNETON, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = { + { + .iv = 250, + .lvl = 36, + .species = SPECIES_MAGNETON, + }, + { + .iv = 250, + .lvl = 36, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = { + { + .iv = 250, + .lvl = 39, + .species = SPECIES_MAGNETON, + .moves = MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT + }, + { + .iv = 250, + .lvl = 39, + .species = SPECIES_EXPLOUD, + .moves = MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = { + { + .iv = 10, + .lvl = 12, + .species = SPECIES_AZURILL, + }, + { + .iv = 10, + .lvl = 12, + .species = SPECIES_AZURILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austina[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = { + { + .iv = 10, + .lvl = 26, + .species = SPECIES_MARILL, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = { + { + .iv = 20, + .lvl = 29, + .species = SPECIES_MARILL, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = { + { + .iv = 30, + .lvl = 32, + .species = SPECIES_MARILL, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = { + { + .iv = 40, + .lvl = 35, + .species = SPECIES_AZUMARILL, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_AZUMARILL, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = { + { + .iv = 10, + .lvl = 13, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = { + { + .iv = 0, + .lvl = 12, + .species = SPECIES_AZURILL, + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = { + { + .iv = 10, + .lvl = 27, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = { + { + .iv = 20, + .lvl = 30, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = { + { + .iv = 30, + .lvl = 33, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = { + { + .iv = 40, + .lvl = 36, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Randall[] = { + { + .iv = 255, + .lvl = 26, + .species = SPECIES_SWELLOW, + .heldItem = ITEM_NONE, + .moves = MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Parker[] = { + { + .iv = 255, + .lvl = 26, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_George[] = { + { + .iv = 255, + .lvl = 26, + .species = SPECIES_SLAKOTH, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Berke[] = { + { + .iv = 255, + .lvl = 26, + .species = SPECIES_VIGOROTH, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Braxton[] = { + { + .iv = 100, + .lvl = 28, + .species = SPECIES_SWELLOW, + .moves = MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_TRAPINCH, + .moves = MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_WAILMER, + .moves = MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_MAGNETON, + .moves = MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_SHIFTRY, + .moves = MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = { + { + .iv = 100, + .lvl = 44, + .species = SPECIES_SABLEYE, + }, + { + .iv = 100, + .lvl = 44, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 100, + .lvl = 44, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = { + { + .iv = 100, + .lvl = 46, + .species = SPECIES_MAWILE, + }, + { + .iv = 100, + .lvl = 46, + .species = SPECIES_STARMIE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = { + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_WAILMER, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = { + { + .iv = 100, + .lvl = 43, + .species = SPECIES_CACTURNE, + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_PELIPPER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = { + { + .iv = 100, + .lvl = 43, + .species = SPECIES_MAGNETON, + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_MUK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = { + { + .iv = 100, + .lvl = 42, + .species = SPECIES_SWELLOW, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_MAWILE, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_KADABRA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = { + { + .iv = 100, + .lvl = 42, + .species = SPECIES_DODRIO, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_KADABRA, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_ELECTRODE, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_SHIFTRY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = { + { + .iv = 100, + .lvl = 42, + .species = SPECIES_KECLEON, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_GRAVELER, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_WAILORD, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = { + { + .iv = 110, + .lvl = 26, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_WAILMER, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = { + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_WAILMER, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = { + { + .iv = 130, + .lvl = 32, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_WAILMER, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = { + { + .iv = 140, + .lvl = 35, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 140, + .lvl = 35, + .species = SPECIES_WAILMER, + }, + { + .iv = 140, + .lvl = 35, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = { + { + .iv = 100, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 100, + .lvl = 33, + .species = SPECIES_LUDICOLO, + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Mary[] = { + { + .iv = 255, + .lvl = 26, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_NONE, + .moves = MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Alexia[] = { + { + .iv = 255, + .lvl = 26, + .species = SPECIES_WIGGLYTUFF, + .heldItem = ITEM_NONE, + .moves = MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Jody[] = { + { + .iv = 255, + .lvl = 26, + .species = SPECIES_ZANGOOSE, + .heldItem = ITEM_NONE, + .moves = MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = { + { + .iv = 100, + .lvl = 29, + .species = SPECIES_MAWILE, + .moves = MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_ROSELIA, + .moves = MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + .moves = MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keira[] = { + { + .iv = 100, + .lvl = 45, + .species = SPECIES_LAIRON, + }, + { + .iv = 100, + .lvl = 45, + .species = SPECIES_MANECTRIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = { + { + .iv = 100, + .lvl = 17, + .species = SPECIES_WINGULL, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_NUMEL, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = { + { + .iv = 200, + .lvl = 30, + .species = SPECIES_SABLEYE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = { + { + .iv = 100, + .lvl = 45, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = { + { + .iv = 100, + .lvl = 45, + .species = SPECIES_CLAYDOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = { + { + .iv = 100, + .lvl = 42, + .species = SPECIES_TORKOAL, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_LUDICOLO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = { + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SKARMORY, + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SABLEYE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = { + { + .iv = 100, + .lvl = 42, + .species = SPECIES_SANDSLASH, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_NINETALES, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_TROPIUS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = { + { + .iv = 110, + .lvl = 26, + .species = SPECIES_WINGULL, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_NUMEL, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = { + { + .iv = 120, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_NUMEL, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = { + { + .iv = 130, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_NUMEL, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = { + { + .iv = 140, + .lvl = 34, + .species = SPECIES_PELIPPER, + }, + { + .iv = 140, + .lvl = 34, + .species = SPECIES_CAMERUPT, + }, + { + .iv = 140, + .lvl = 34, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = { + { + .iv = 0, + .lvl = 41, + .species = SPECIES_BANETTE, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_LUNATONE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_DUSKULL, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SHUPPET, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_DUSKULL, + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SHUPPET, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SABLEYE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = { + { + .iv = 50, + .lvl = 32, + .species = SPECIES_SHUPPET, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = { + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SABLEYE, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SPOINK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = { + { + .iv = 20, + .lvl = 35, + .species = SPECIES_SPOINK, + }, + { + .iv = 20, + .lvl = 35, + .species = SPECIES_SABLEYE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = { + { + .iv = 30, + .lvl = 40, + .species = SPECIES_SPOINK, + }, + { + .iv = 30, + .lvl = 40, + .species = SPECIES_SABLEYE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = { + { + .iv = 40, + .lvl = 42, + .species = SPECIES_DUSKULL, + }, + { + .iv = 40, + .lvl = 42, + .species = SPECIES_SABLEYE, + }, + { + .iv = 40, + .lvl = 42, + .species = SPECIES_GRUMPIG, + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = { + { + .iv = 0, + .lvl = 7, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Daphne[] = { + { + .iv = 100, + .lvl = 39, + .species = SPECIES_LUVDISC, + .heldItem = ITEM_NUGGET, + .moves = MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_LUVDISC, + .heldItem = ITEM_NUGGET, + .moves = MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Cindy2[] = { + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET, + .moves = MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna[] = { + { + .iv = 150, + .lvl = 40, + .species = SPECIES_SEAKING, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Naomi[] = { + { + .iv = 100, + .lvl = 45, + .species = SPECIES_ROSELIA, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = { + { + .iv = 10, + .lvl = 27, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = { + { + .iv = 20, + .lvl = 30, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = { + { + .iv = 30, + .lvl = 33, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = { + { + .iv = 40, + .lvl = 36, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET, + .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = { + { + .iv = 0, + .lvl = 21, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = { + { + .iv = 0, + .lvl = 21, + .species = SPECIES_SHROOMISH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = { + { + .iv = 0, + .lvl = 21, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = { + { + .iv = 100, + .lvl = 40, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = { + { + .iv = 150, + .lvl = 40, + .species = SPECIES_AZUMARILL, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = { + { + .iv = 100, + .lvl = 35, + .species = SPECIES_CLAMPERL, + .moves = MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_CORPHISH, + .moves = MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_LOMBRE, + .moves = MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = { + { + .iv = 100, + .lvl = 39, + .species = SPECIES_CARVANHA, + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = { + { + .iv = 10, + .lvl = 35, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 10, + .lvl = 35, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = { + { + .iv = 20, + .lvl = 38, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 20, + .lvl = 38, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = { + { + .iv = 30, + .lvl = 41, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = { + { + .iv = 40, + .lvl = 44, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 40, + .lvl = 44, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = { + { + .iv = 0, + .lvl = 7, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mollie[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WHISCASH, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_MEDITITE, + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = { + { + .iv = 0, + .lvl = 45, + .species = SPECIES_AZUMARILL, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = { + { + .iv = 0, + .lvl = 36, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET, + .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_ARON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia1[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_HORSEA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_RHYHORN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = { + { + .iv = 0, + .lvl = 20, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = { + { + .iv = 10, + .lvl = 27, + .species = SPECIES_LAIRON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = { + { + .iv = 20, + .lvl = 29, + .species = SPECIES_LAIRON, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_RHYHORN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = { + { + .iv = 30, + .lvl = 32, + .species = SPECIES_LAIRON, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_RHYHORN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = { + { + .iv = 40, + .lvl = 35, + .species = SPECIES_AGGRON, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_RHYDON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dominik[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = { + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = { + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolen[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_HORSEA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_PELIPPER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Santiago[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACRUEL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEALEO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SPHEAL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = { + { + .iv = 10, + .lvl = 30, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = { + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = { + { + .iv = 30, + .lvl = 34, + .species = SPECIES_STARYU, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = { + { + .iv = 40, + .lvl = 37, + .species = SPECIES_STARMIE, + }, + { + .iv = 40, + .lvl = 39, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takao[] = { + { + .iv = 127, + .lvl = 13, + .species = SPECIES_MACHOP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = { + { + .iv = 50, + .lvl = 32, + .species = SPECIES_MACHOP, + }, + { + .iv = 200, + .lvl = 32, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = { + { + .iv = 100, + .lvl = 34, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = { + { + .iv = 100, + .lvl = 24, + .species = SPECIES_MACHOP, + }, + { + .iv = 150, + .lvl = 28, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = { + { + .iv = 100, + .lvl = 19, + .species = SPECIES_MACHOP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = { + { + .iv = 110, + .lvl = 27, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = { + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MACHOP, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = { + { + .iv = 130, + .lvl = 31, + .species = SPECIES_MACHOP, + }, + { + .iv = 130, + .lvl = 31, + .species = SPECIES_MACHOKE, + }, + { + .iv = 130, + .lvl = 31, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = { + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHOP, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHOKE, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHOKE, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_BLACK_BELT + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = { + { + .iv = 100, + .lvl = 26, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 100, + .lvl = 26, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = { + { + .iv = 100, + .lvl = 19, + .species = SPECIES_MACHOP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = { + { + .iv = 100, + .lvl = 32, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Kirk[] = { + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ELECTRIKE, + .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_VOLTORB, + .moves = MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = { + { + .iv = 100, + .lvl = 17, + .species = SPECIES_VOLTORB, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando1[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 0, + .lvl = 15, + .species = SPECIES_WHISMUR, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = { + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_WHISMUR, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = { + { + .iv = 20, + .lvl = 28, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_LOUDRED, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = { + { + .iv = 30, + .lvl = 31, + .species = SPECIES_MAGNETON, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_LOUDRED, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_MAGNETON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = { + { + .iv = 40, + .lvl = 34, + .species = SPECIES_MAGNETON, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_EXPLOUD, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_MAGNETON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = { + { + .iv = 100, + .lvl = 23, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = { + { + .iv = 100, + .lvl = 22, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 22, + .species = SPECIES_SLUGMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = { + { + .iv = 100, + .lvl = 23, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jace[] = { + { + .iv = 100, + .lvl = 23, + .species = SPECIES_SLUGMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keegan[] = { + { + .iv = 120, + .lvl = 23, + .species = SPECIES_SLUGMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_WINGULL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = { + { + .iv = 10, + .lvl = 26, + .species = SPECIES_SLUGMA, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_WINGULL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = { + { + .iv = 20, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_PELIPPER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = { + { + .iv = 30, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_PELIPPER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = { + { + .iv = 40, + .lvl = 35, + .species = SPECIES_MAGCARGO, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_PELIPPER, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = { + { + .iv = 0, + .lvl = 23, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Beau[] = { + { + .iv = 0, + .lvl = 21, + .species = SPECIES_BALTOY, + .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB + }, + { + .iv = 0, + .lvl = 21, + .species = SPECIES_SANDSHREW, + .moves = MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG + }, + { + .iv = 0, + .lvl = 21, + .species = SPECIES_BALTOY, + .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUZLEAF, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUZLEAF, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = { + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KECLEON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = { + { + .iv = 0, + .lvl = 20, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_TAILLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Autumn[] = { + { + .iv = 0, + .lvl = 21, + .species = SPECIES_SHROOMISH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SANDSHREW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = { + { + .iv = 10, + .lvl = 26, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_TAILLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = { + { + .iv = 20, + .lvl = 29, + .species = SPECIES_LINOONE, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_SWELLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = { + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SWELLOW, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_LINOONE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = { + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SANDSLASH, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_LINOONE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = { + { + .iv = 100, + .lvl = 26, + .species = SPECIES_SURSKIT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = { + { + .iv = 100, + .lvl = 24, + .species = SPECIES_WURMPLE, + }, + { + .iv = 100, + .lvl = 24, + .species = SPECIES_SILCOON, + }, + { + .iv = 100, + .lvl = 24, + .species = SPECIES_BEAUTIFLY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = { + { + .iv = 100, + .lvl = 27, + .species = SPECIES_WURMPLE, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_CASCOON, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_DUSTOX, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey1[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_SURSKIT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_SURSKIT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_SURSKIT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = { + { + .iv = 150, + .lvl = 16, + .species = SPECIES_DUSTOX, + }, + { + .iv = 150, + .lvl = 16, + .species = SPECIES_BEAUTIFLY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey2[] = { + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SURSKIT, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SURSKIT, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SURSKIT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey3[] = { + { + .iv = 20, + .lvl = 34, + .species = SPECIES_SURSKIT, + }, + { + .iv = 20, + .lvl = 34, + .species = SPECIES_SURSKIT, + }, + { + .iv = 20, + .lvl = 34, + .species = SPECIES_MASQUERAIN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey4[] = { + { + .iv = 30, + .lvl = 36, + .species = SPECIES_SURSKIT, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_WURMPLE, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_SURSKIT, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_MASQUERAIN, + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Jeffrey5[] = { + { + .iv = 40, + .lvl = 38, + .species = SPECIES_SURSKIT, + .heldItem = ITEM_NONE + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_DUSTOX, + .heldItem = ITEM_NONE + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_SURSKIT, + .heldItem = ITEM_NONE + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_MASQUERAIN, + .heldItem = ITEM_SILVER_POWDER + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_BEAUTIFLY, + .heldItem = ITEM_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_ABRA, + .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KIRLIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_RALTS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Blake[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_GIRAFARIG, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_RALTS, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_RALTS, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KIRLIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = { + { + .iv = 0, + .lvl = 41, + .species = SPECIES_KADABRA, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_SOLROCK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_SOLROCK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = { + { + .iv = 10, + .lvl = 33, + .species = SPECIES_KADABRA, + }, + { + .iv = 10, + .lvl = 33, + .species = SPECIES_SOLROCK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = { + { + .iv = 20, + .lvl = 38, + .species = SPECIES_KADABRA, + }, + { + .iv = 20, + .lvl = 38, + .species = SPECIES_SOLROCK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = { + { + .iv = 30, + .lvl = 41, + .species = SPECIES_KADABRA, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_SOLROCK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = { + { + .iv = 40, + .lvl = 45, + .species = SPECIES_SOLROCK, + }, + { + .iv = 40, + .lvl = 45, + .species = SPECIES_ALAKAZAM, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = { + { + .iv = 0, + .lvl = 16, + .species = SPECIES_ABRA, + .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KIRLIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_XATU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KADABRA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WOBBUFFET, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NATU, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KADABRA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = { + { + .iv = 0, + .lvl = 41, + .species = SPECIES_KIRLIA, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_XATU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_KADABRA, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_LUNATONE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = { + { + .iv = 10, + .lvl = 34, + .species = SPECIES_KADABRA, + }, + { + .iv = 10, + .lvl = 34, + .species = SPECIES_LUNATONE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = { + { + .iv = 20, + .lvl = 37, + .species = SPECIES_KADABRA, + }, + { + .iv = 20, + .lvl = 37, + .species = SPECIES_LUNATONE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = { + { + .iv = 30, + .lvl = 40, + .species = SPECIES_KADABRA, + }, + { + .iv = 30, + .lvl = 40, + .species = SPECIES_LUNATONE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = { + { + .iv = 40, + .lvl = 43, + .species = SPECIES_LUNATONE, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_ALAKAZAM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MANECTRIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Micah[] = { + { + .iv = 0, + .lvl = 44, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 0, + .lvl = 44, + .species = SPECIES_MANECTRIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = { + { + .iv = 0, + .lvl = 45, + .species = SPECIES_ZANGOOSE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = { + { + .iv = 10, + .lvl = 34, + .species = SPECIES_MANECTRIC, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = { + { + .iv = 20, + .lvl = 36, + .species = SPECIES_LINOONE, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES + }, + { + .iv = 20, + .lvl = 36, + .species = SPECIES_MANECTRIC, + .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = { + { + .iv = 30, + .lvl = 39, + .species = SPECIES_LINOONE, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES + }, + { + .iv = 30, + .lvl = 39, + .species = SPECIES_MANECTRIC, + .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = { + { + .iv = 40, + .lvl = 41, + .species = SPECIES_LINOONE, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_GOLDUCK, + .moves = MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_MANECTRIC, + .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = { + { + .iv = 250, + .lvl = 46, + .species = SPECIES_MIGHTYENA, + .heldItem = ITEM_NONE, + .moves = MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH + }, + { + .iv = 250, + .lvl = 48, + .species = SPECIES_SHIFTRY, + .heldItem = ITEM_NONE, + .moves = MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY + }, + { + .iv = 250, + .lvl = 46, + .species = SPECIES_CACTURNE, + .heldItem = ITEM_NONE, + .moves = MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE + }, + { + .iv = 250, + .lvl = 48, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_ABSOL, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = { + { + .iv = 250, + .lvl = 48, + .species = SPECIES_DUSCLOPS, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT + }, + { + .iv = 250, + .lvl = 49, + .species = SPECIES_BANETTE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK + }, + { + .iv = 250, + .lvl = 50, + .species = SPECIES_SABLEYE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK + }, + { + .iv = 250, + .lvl = 49, + .species = SPECIES_BANETTE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_DUSCLOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = { + { + .iv = 250, + .lvl = 50, + .species = SPECIES_SEALEO, + .heldItem = ITEM_NONE, + .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL + }, + { + .iv = 250, + .lvl = 50, + .species = SPECIES_GLALIE, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM + }, + { + .iv = 250, + .lvl = 52, + .species = SPECIES_SEALEO, + .heldItem = ITEM_NONE, + .moves = MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD + }, + { + .iv = 250, + .lvl = 52, + .species = SPECIES_GLALIE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_WALREIN, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = { + { + .iv = 250, + .lvl = 52, + .species = SPECIES_SHELGON, + .heldItem = ITEM_NONE, + .moves = MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE + }, + { + .iv = 250, + .lvl = 54, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_NONE, + .moves = MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE + }, + { + .iv = 250, + .lvl = 53, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_NONE, + .moves = MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM + }, + { + .iv = 250, + .lvl = 53, + .species = SPECIES_FLYGON, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_SALAMENCE, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne1[] = { + { + .iv = 100, + .lvl = 12, + .species = SPECIES_GEODUDE, + .heldItem = ITEM_NONE, + .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB + }, + { + .iv = 100, + .lvl = 12, + .species = SPECIES_GEODUDE, + .heldItem = ITEM_NONE, + .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB + }, + { + .iv = 200, + .lvl = 15, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Brawly1[] = { + { + .iv = 100, + .lvl = 16, + .species = SPECIES_MACHOP, + .heldItem = ITEM_NONE, + .moves = MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP + }, + { + .iv = 100, + .lvl = 16, + .species = SPECIES_MEDITITE, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP + }, + { + .iv = 200, + .lvl = 19, + .species = SPECIES_MAKUHITA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Wattson1[] = { + { + .iv = 200, + .lvl = 20, + .species = SPECIES_VOLTORB, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE + }, + { + .iv = 200, + .lvl = 20, + .species = SPECIES_ELECTRIKE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL + }, + { + .iv = 220, + .lvl = 22, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_NONE, + .moves = MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM + }, + { + .iv = 250, + .lvl = 24, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Flannery1[] = { + { + .iv = 200, + .lvl = 24, + .species = SPECIES_NUMEL, + .heldItem = ITEM_NONE, + .moves = MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + }, + { + .iv = 200, + .lvl = 24, + .species = SPECIES_SLUGMA, + .heldItem = ITEM_NONE, + .moves = MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY + }, + { + .iv = 250, + .lvl = 26, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_NONE, + .moves = MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT + }, + { + .iv = 250, + .lvl = 29, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Norman1[] = { + { + .iv = 200, + .lvl = 27, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE + }, + { + .iv = 200, + .lvl = 27, + .species = SPECIES_VIGOROTH, + .heldItem = ITEM_NONE, + .moves = MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK + }, + { + .iv = 200, + .lvl = 29, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NONE, + .moves = MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT + }, + { + .iv = 250, + .lvl = 31, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Winona1[] = { + { + .iv = 210, + .lvl = 29, + .species = SPECIES_SWABLU, + .heldItem = ITEM_NONE, + .moves = MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE + }, + { + .iv = 210, + .lvl = 29, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS + }, + { + .iv = 210, + .lvl = 30, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 220, + .lvl = 31, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 33, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza1[] = { + { + .iv = 250, + .lvl = 41, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 250, + .lvl = 41, + .species = SPECIES_XATU, + .heldItem = ITEM_NONE, + .moves = MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 250, + .lvl = 42, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND + }, + { + .iv = 250, + .lvl = 42, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Juan1[] = { + { + .iv = 200, + .lvl = 41, + .species = SPECIES_LUVDISC, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL + }, + { + .iv = 200, + .lvl = 41, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE + }, + { + .iv = 200, + .lvl = 43, + .species = SPECIES_SEALEO, + .heldItem = ITEM_NONE, + .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE + }, + { + .iv = 200, + .lvl = 43, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER + }, + { + .iv = 250, + .lvl = 46, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = { + { + .iv = 10, + .lvl = 9, + .species = SPECIES_RALTS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = { + { + .iv = 10, + .lvl = 17, + .species = SPECIES_RALTS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = { + { + .iv = 10, + .lvl = 15, + .species = SPECIES_NUMEL, + }, + { + .iv = 10, + .lvl = 15, + .species = SPECIES_ODDISH, + }, + { + .iv = 10, + .lvl = 15, + .species = SPECIES_WINGULL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = { + { + .iv = 20, + .lvl = 26, + .species = SPECIES_RALTS, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_MEDITITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = { + { + .iv = 30, + .lvl = 29, + .species = SPECIES_KIRLIA, + }, + { + .iv = 30, + .lvl = 29, + .species = SPECIES_MEDITITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = { + { + .iv = 40, + .lvl = 32, + .species = SPECIES_KIRLIA, + }, + { + .iv = 40, + .lvl = 32, + .species = SPECIES_MEDICHAM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = { + { + .iv = 50, + .lvl = 34, + .species = SPECIES_KIRLIA, + }, + { + .iv = 50, + .lvl = 34, + .species = SPECIES_BANETTE, + }, + { + .iv = 50, + .lvl = 34, + .species = SPECIES_MEDICHAM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = { + { + .iv = 10, + .lvl = 9, + .species = SPECIES_SHROOMISH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = { + { + .iv = 10, + .lvl = 16, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 16, + .species = SPECIES_BEAUTIFLY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = { + { + .iv = 20, + .lvl = 26, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_WHISMUR, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = { + { + .iv = 30, + .lvl = 29, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 30, + .lvl = 29, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = { + { + .iv = 40, + .lvl = 32, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 32, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = { + { + .iv = 50, + .lvl = 35, + .species = SPECIES_BRELOOM, + }, + { + .iv = 50, + .lvl = 35, + .species = SPECIES_EXPLOUD, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SPINDA, + .moves = MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SLAKING, + .moves = MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = { + { + .iv = 10, + .lvl = 28, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = { + { + .iv = 20, + .lvl = 31, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = { + { + .iv = 30, + .lvl = 34, + .species = SPECIES_LINOONE, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = { + { + .iv = 40, + .lvl = 36, + .species = SPECIES_LINOONE, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_HARIYAMA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = { + { + .iv = 25, + .lvl = 16, + .species = SPECIES_TAILLOW, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 25, + .lvl = 16, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = { + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 40, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 42, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = { + { + .iv = 0, + .lvl = 35, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = { + { + .iv = 0, + .lvl = 38, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_SITRUS_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = { + { + .iv = 50, + .lvl = 17, + .species = SPECIES_ROSELIA, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_PIKACHU, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Bethany[] = { + { + .iv = 100, + .lvl = 35, + .species = SPECIES_AZURILL, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_MARILL, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_AZUMARILL, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = { + { + .iv = 10, + .lvl = 26, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = { + { + .iv = 20, + .lvl = 29, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = { + { + .iv = 30, + .lvl = 32, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = { + { + .iv = 40, + .lvl = 35, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_SITRUS_BERRY + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_MINUN, + .heldItem = ITEM_SITRUS_BERRY + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = { + { + .iv = 200, + .lvl = 27, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = { + { + .iv = 210, + .lvl = 33, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = { + { + .iv = 220, + .lvl = 36, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = { + { + .iv = 230, + .lvl = 39, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = { + { + .iv = 240, + .lvl = 42, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = { + { + .iv = 200, + .lvl = 18, + .species = SPECIES_MEDITITE, + .moves = MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = { + { + .iv = 200, + .lvl = 21, + .species = SPECIES_MEDITITE, + }, + { + .iv = 200, + .lvl = 21, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = { + { + .iv = 210, + .lvl = 30, + .species = SPECIES_MEDITITE, + }, + { + .iv = 210, + .lvl = 30, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = { + { + .iv = 220, + .lvl = 33, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 220, + .lvl = 33, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = { + { + .iv = 230, + .lvl = 36, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 230, + .lvl = 36, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = { + { + .iv = 240, + .lvl = 39, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 240, + .lvl = 39, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 7, + .species = SPECIES_SEEDOT, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = { + { + .iv = 100, + .lvl = 10, + .species = SPECIES_GEODUDE, + .moves = MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = { + { + .iv = 110, + .lvl = 8, + .species = SPECIES_GEODUDE, + }, + { + .iv = 120, + .lvl = 8, + .species = SPECIES_GEODUDE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = { + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MACHOP, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = { + { + .iv = 150, + .lvl = 17, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT + }, + { + .iv = 150, + .lvl = 17, + .species = SPECIES_GULPIN, + .moves = MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Quincy[] = { + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SLAKING, + .moves = MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_DUSCLOPS, + .moves = MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Katelynn[] = { + { + .iv = 100, + .lvl = 43, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SLAKING, + .moves = MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaylen[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_TRAPINCH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_ARON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = { + { + .iv = 10, + .lvl = 27, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = { + { + .iv = 20, + .lvl = 28, + .species = SPECIES_SWELLOW, + }, + { + .iv = 20, + .lvl = 30, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = { + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SWELLOW, + }, + { + .iv = 30, + .lvl = 29, + .species = SPECIES_LINOONE, + }, + { + .iv = 30, + .lvl = 33, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = { + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 32, + .species = SPECIES_LINOONE, + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_ZIGZAGOON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = { + { + .iv = 0, + .lvl = 4, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_TAILLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 13, + .species = SPECIES_ELECTRIKE, + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Wallace[] = { + { + .iv = 255, + .lvl = 57, + .species = SPECIES_WAILORD, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_TENTACRUEL, + .heldItem = ITEM_NONE, + .moves = MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_LUDICOLO, + .heldItem = ITEM_NONE, + .moves = MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_GYARADOS, + .heldItem = ITEM_NONE, + .moves = MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_MILOTIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGIKARP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 7, + .species = SPECIES_MAGIKARP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = { + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_BARBOACH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = { + { + .iv = 0, + .lvl = 10, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 7, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_MAGIKARP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = { + { + .iv = 10, + .lvl = 11, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = { + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_BARBOACH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = { + { + .iv = 0, + .lvl = 16, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = { + { + .iv = 10, + .lvl = 25, + .species = SPECIES_WAILMER, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = { + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 27, + .species = SPECIES_GYARADOS, + }, + { + .iv = 10, + .lvl = 27, + .species = SPECIES_GYARADOS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = { + { + .iv = 20, + .lvl = 29, + .species = SPECIES_GYARADOS, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_CARVANHA, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_GYARADOS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = { + { + .iv = 30, + .lvl = 31, + .species = SPECIES_GYARADOS, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_CARVANHA, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_TENTACRUEL, + }, + { + .iv = 31, + .lvl = 31, + .species = SPECIES_GYARADOS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = { + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GYARADOS, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_SHARPEDO, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GYARADOS, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 21, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 23, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_GYARADOS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = { + { + .iv = 20, + .lvl = 6, + .species = SPECIES_VOLTORB, + }, + { + .iv = 20, + .lvl = 6, + .species = SPECIES_VOLTORB, + }, + { + .iv = 200, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = { + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = { + { + .iv = 10, + .lvl = 30, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = { + { + .iv = 20, + .lvl = 33, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = { + { + .iv = 30, + .lvl = 36, + .species = SPECIES_MAGNETON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = { + { + .iv = 40, + .lvl = 39, + .species = SPECIES_MAGNETON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = { + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = { + { + .iv = 80, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 80, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_VOLTORB, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = { + { + .iv = 10, + .lvl = 28, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = { + { + .iv = 20, + .lvl = 31, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = { + { + .iv = 30, + .lvl = 34, + .species = SPECIES_MAGNETON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = { + { + .iv = 40, + .lvl = 37, + .species = SPECIES_MAGNETON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_DODUO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = { + { + .iv = 10, + .lvl = 28, + .species = SPECIES_DODUO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = { + { + .iv = 20, + .lvl = 31, + .species = SPECIES_DODUO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = { + { + .iv = 30, + .lvl = 34, + .species = SPECIES_DODRIO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = { + { + .iv = 40, + .lvl = 37, + .species = SPECIES_DODRIO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_DODUO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = { + { + .iv = 10, + .lvl = 28, + .species = SPECIES_DODUO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = { + { + .iv = 20, + .lvl = 31, + .species = SPECIES_DODUO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = { + { + .iv = 30, + .lvl = 34, + .species = SPECIES_DODRIO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = { + { + .iv = 40, + .lvl = 37, + .species = SPECIES_DODRIO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camden[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Demetrius[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ELECTRIKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = { + { + .iv = 0, + .lvl = 35, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo1[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WINGULL, + }, + { + .iv = 80, + .lvl = 34, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = { + { + .iv = 10, + .lvl = 39, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = { + { + .iv = 20, + .lvl = 42, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = { + { + .iv = 30, + .lvl = 45, + .species = SPECIES_STARMIE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = { + { + .iv = 40, + .lvl = 48, + .species = SPECIES_STARMIE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isobel[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donny[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WINGULL, + }, + { + .iv = 160, + .lvl = 34, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Talia[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = { + { + .iv = 0, + .lvl = 35, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_WINGULL, + }, + { + .iv = 240, + .lvl = 33, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = { + { + .iv = 10, + .lvl = 39, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = { + { + .iv = 20, + .lvl = 42, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = { + { + .iv = 30, + .lvl = 45, + .species = SPECIES_STARMIE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = { + { + .iv = 40, + .lvl = 48, + .species = SPECIES_STARMIE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = { + { + .iv = 100, + .lvl = 37, + .species = SPECIES_ALTARIA, + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_ALTARIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = { + { + .iv = 110, + .lvl = 41, + .species = SPECIES_ALTARIA, + }, + { + .iv = 110, + .lvl = 41, + .species = SPECIES_ALTARIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = { + { + .iv = 120, + .lvl = 44, + .species = SPECIES_ALTARIA, + }, + { + .iv = 120, + .lvl = 44, + .species = SPECIES_ALTARIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = { + { + .iv = 130, + .lvl = 46, + .species = SPECIES_BAGON, + }, + { + .iv = 130, + .lvl = 46, + .species = SPECIES_ALTARIA, + }, + { + .iv = 130, + .lvl = 46, + .species = SPECIES_ALTARIA, + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = { + { + .iv = 140, + .lvl = 49, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 49, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 49, + .species = SPECIES_SHELGON, + .heldItem = ITEM_DRAGON_FANG + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Aaron[] = { + { + .iv = 255, + .lvl = 34, + .species = SPECIES_BAGON, + .moves = MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WINGULL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TROPIUS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SWELLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = { + { + .iv = 100, + .lvl = 27, + .species = SPECIES_DODUO, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SKARMORY, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_TROPIUS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Humberto[] = { + { + .iv = 250, + .lvl = 30, + .species = SPECIES_SKARMORY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Presley[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TROPIUS, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_XATU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwardo[] = { + { + .iv = 150, + .lvl = 29, + .species = SPECIES_DODUO, + }, + { + .iv = 150, + .lvl = 29, + .species = SPECIES_PELIPPER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = { + { + .iv = 0, + .lvl = 28, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NATU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SWABLU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = { + { + .iv = 0, + .lvl = 36, + .species = SPECIES_SWELLOW, + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_XATU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SWELLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = { + { + .iv = 10, + .lvl = 32, + .species = SPECIES_NATU, + }, + { + .iv = 10, + .lvl = 32, + .species = SPECIES_SWABLU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = { + { + .iv = 20, + .lvl = 35, + .species = SPECIES_NATU, + }, + { + .iv = 20, + .lvl = 35, + .species = SPECIES_ALTARIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = { + { + .iv = 30, + .lvl = 38, + .species = SPECIES_NATU, + }, + { + .iv = 30, + .lvl = 38, + .species = SPECIES_ALTARIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = { + { + .iv = 40, + .lvl = 41, + .species = SPECIES_ALTARIA, + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_XATU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = { + { + .iv = 150, + .lvl = 33, + .species = SPECIES_NATU, + }, + { + .iv = 150, + .lvl = 33, + .species = SPECIES_SWELLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_TROPIUS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NINJASK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_NINJASK, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_KOFFING, + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Dianne[] = { + { + .iv = 0, + .lvl = 43, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_LANTURN, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jani[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_KOFFING, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NINJASK, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = { + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = { + { + .iv = 20, + .lvl = 27, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = { + { + .iv = 30, + .lvl = 30, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = { + { + .iv = 40, + .lvl = 33, + .species = SPECIES_KOFFING, + .heldItem = ITEM_NONE, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_KOFFING, + .heldItem = ITEM_NONE, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_KOFFING, + .heldItem = ITEM_NONE, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_WEEZING, + .heldItem = ITEM_SMOKE_BALL, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jocelyn[] = { + { + .iv = 127, + .lvl = 13, + .species = SPECIES_MEDITITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = { + { + .iv = 150, + .lvl = 13, + .species = SPECIES_MEDITITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = { + { + .iv = 100, + .lvl = 18, + .species = SPECIES_MEDITITE, + }, + { + .iv = 100, + .lvl = 18, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = { + { + .iv = 100, + .lvl = 27, + .species = SPECIES_MEDITITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paula[] = { + { + .iv = 100, + .lvl = 27, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = { + { + .iv = 110, + .lvl = 26, + .species = SPECIES_MEDITITE, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = { + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MEDITITE, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = { + { + .iv = 130, + .lvl = 32, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = { + { + .iv = 140, + .lvl = 35, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 140, + .lvl = 35, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_NUMEL, + .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = { + { + .iv = 0, + .lvl = 28, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Angelica[] = { + { + .iv = 50, + .lvl = 30, + .species = SPECIES_CASTFORM, + .moves = MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = { + { + .iv = 10, + .lvl = 29, + .species = SPECIES_NUMEL, + .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = { + { + .iv = 20, + .lvl = 32, + .species = SPECIES_NUMEL, + .moves = MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = { + { + .iv = 30, + .lvl = 34, + .species = SPECIES_ROSELIA, + .moves = MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY + }, + { + .iv = 30, + .lvl = 34, + .species = SPECIES_NUMEL, + .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = { + { + .iv = 40, + .lvl = 37, + .species = SPECIES_ROSELIA, + .moves = MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_CAMERUPT, + .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Imani[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyla[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_HORSEA, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = { + { + .iv = 0, + .lvl = 24, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_LUVDISC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEAKING, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SPHEAL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SPHEAL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_LUVDISC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEAKING, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_AZUMARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sienna[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEAKING, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_HORSEA, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SEADRA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 34, + .species = SPECIES_PELIPPER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlee[] = { + { + .iv = 0, + .lvl = 35, + .species = SPECIES_SEAKING, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = { + { + .iv = 0, + .lvl = 38, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = { + { + .iv = 0, + .lvl = 41, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = { + { + .iv = 0, + .lvl = 43, + .species = SPECIES_STARYU, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = { + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 45, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 45, + .species = SPECIES_STARMIE, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = { + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_BALTOY, + .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = { + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSHREW, + .moves = MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_MARILL, + .moves = MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_LOMBRE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_LOMBRE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = { + { + .iv = 0, + .lvl = 23, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 23, + .species = SPECIES_SWABLU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_ODDISH, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SWABLU, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Cedric[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_WOBBUFFET, + .moves = MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = { + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_GLOOM, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SWABLU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = { + { + .iv = 20, + .lvl = 28, + .species = SPECIES_BRELOOM, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_GLOOM, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_SWABLU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = { + { + .iv = 30, + .lvl = 31, + .species = SPECIES_BRELOOM, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_GLOOM, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SWABLU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = { + { + .iv = 40, + .lvl = 40, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_VILEPLUME, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_ALTARIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_PLUSLE, + }, + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MINUN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = { + { + .iv = 10, + .lvl = 27, + .species = SPECIES_PLUSLE, + }, + { + .iv = 10, + .lvl = 27, + .species = SPECIES_MINUN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = { + { + .iv = 0, + .lvl = 6, + .species = SPECIES_SEEDOT, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_LOTAD, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_BEAUTIFLY, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_DUSTOX, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = { + { + .iv = 0, + .lvl = 9, + .species = SPECIES_PLUSLE, + }, + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MINUN, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = { + { + .iv = 0, + .lvl = 10, + .species = SPECIES_DUSKULL, + .moves = MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_SHROOMISH, + .moves = MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = { + { + .iv = 20, + .lvl = 30, + .species = SPECIES_PLUSLE, + }, + { + .iv = 20, + .lvl = 30, + .species = SPECIES_MINUN, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = { + { + .iv = 30, + .lvl = 33, + .species = SPECIES_PLUSLE, + .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND + }, + { + .iv = 30, + .lvl = 33, + .species = SPECIES_MINUN, + .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = { + { + .iv = 40, + .lvl = 36, + .species = SPECIES_PLUSLE, + .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_MINUN, + .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = { + { + .iv = 10, + .lvl = 12, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 12, + .species = SPECIES_MACHOP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = { + { + .iv = 0, + .lvl = 13, + .species = SPECIES_WINGULL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = { + { + .iv = 0, + .lvl = 11, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_MACHOP, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = { + { + .iv = 0, + .lvl = 44, + .species = SPECIES_TENTACRUEL, + }, + { + .iv = 0, + .lvl = 44, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = { + { + .iv = 0, + .lvl = 43, + .species = SPECIES_MACHOP, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SPHEAL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = { + { + .iv = 10, + .lvl = 36, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 36, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 36, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = { + { + .iv = 20, + .lvl = 39, + .species = SPECIES_PELIPPER, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = { + { + .iv = 30, + .lvl = 42, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 42, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 30, + .lvl = 42, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = { + { + .iv = 40, + .lvl = 45, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 45, + .species = SPECIES_MACHOKE, + }, + { + .iv = 40, + .lvl = 45, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eli[] = { + { + .iv = 100, + .lvl = 23, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Annika[] = { + { + .iv = 100, + .lvl = 39, + .species = SPECIES_FEEBAS, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_FEEBAS, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jazmyn[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_ABSOL, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jonas[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_KOFFING, + .moves = MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Kayley[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CASTFORM, + .moves = MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Auron[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MACHAMP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = { + { + .iv = 150, + .lvl = 33, + .species = SPECIES_MACHOKE, + }, + { + .iv = 150, + .lvl = 33, + .species = SPECIES_SPHEAL, + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Marley[] = { + { + .iv = 255, + .lvl = 34, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_NONE, + .moves = MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reyna[] = { + { + .iv = 50, + .lvl = 33, + .species = SPECIES_MEDITITE, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hudson[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Conor[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_CHINCHOU, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_NUZLEAF, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ZANGOOSE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SEVIPER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_CAMERUPT, + }, + { + .iv = 100, + .lvl = 38, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 100, + .lvl = 40, + .species = SPECIES_GOLBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NUZLEAF, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUZLEAF, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_NUZLEAF, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = { + { + .iv = 0, + .lvl = 35, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_SHIFTRY, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = { + { + .iv = 150, + .lvl = 44, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 43, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 44, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 41, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 45, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TREECKO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = { + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_GROVYLE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = { + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_GROVYLE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TORCHIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = { + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_COMBUSKEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = { + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_COMBUSKEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MUDKIP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = { + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_MARSHTOMP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = { + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_MARSHTOMP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TREECKO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = { + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_GROVYLE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = { + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_GROVYLE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TORCHIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = { + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_COMBUSKEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = { + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_COMBUSKEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MUDKIP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = { + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_MARSHTOMP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = { + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_MARSHTOMP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = { + { + .iv = 0, + .lvl = 11, + .species = SPECIES_WHISMUR, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Davis[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_PINSIR, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Mitchell[] = { + { + .iv = 0, + .lvl = 43, + .species = SPECIES_LUNATONE, + .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_SOLROCK, + .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = { + { + .iv = 10, + .lvl = 22, + .species = SPECIES_LOUDRED, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_LINOONE, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_ARON, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_SWELLOW, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = { + { + .iv = 20, + .lvl = 25, + .species = SPECIES_LOUDRED, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_LINOONE, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_ARON, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_SWELLOW, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = { + { + .iv = 30, + .lvl = 28, + .species = SPECIES_LOUDRED, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_LINOONE, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_ARON, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_SWELLOW, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = { + { + .iv = 40, + .lvl = 31, + .species = SPECIES_LOUDRED, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_LINOONE, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_LAIRON, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_HARIYAMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = { + { + .iv = 0, + .lvl = 11, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Halle[] = { + { + .iv = 0, + .lvl = 43, + .species = SPECIES_SABLEYE, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_ABSOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Garrison[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SANDSLASH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = { + { + .iv = 10, + .lvl = 22, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_MARILL, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_ROSELIA, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_SKITTY, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = { + { + .iv = 20, + .lvl = 25, + .species = SPECIES_PELIPPER, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_BRELOOM, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_MARILL, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_ROSELIA, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_DELCATTY, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = { + { + .iv = 30, + .lvl = 28, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_BRELOOM, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_MARILL, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_ROSELIA, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_DELCATTY, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = { + { + .iv = 40, + .lvl = 31, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_AZUMARILL, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_ROSELIA, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_DELCATTY, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_SEAKING, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = { + { + .iv = 50, + .lvl = 27, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lorenzo[] = { + { + .iv = 50, + .lvl = 28, + .species = SPECIES_SEEDOT, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_NUZLEAF, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_LOMBRE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = { + { + .iv = 50, + .lvl = 39, + .species = SPECIES_CACTURNE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = { + { + .iv = 60, + .lvl = 31, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = { + { + .iv = 70, + .lvl = 34, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = { + { + .iv = 80, + .lvl = 37, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = { + { + .iv = 90, + .lvl = 39, + .species = SPECIES_KECLEON, + }, + { + .iv = 90, + .lvl = 39, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = { + { + .iv = 50, + .lvl = 26, + .species = SPECIES_GLOOM, + }, + { + .iv = 50, + .lvl = 26, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = { + { + .iv = 50, + .lvl = 28, + .species = SPECIES_LOTAD, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_LOMBRE, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_NUZLEAF, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = { + { + .iv = 50, + .lvl = 38, + .species = SPECIES_SWABLU, + }, + { + .iv = 50, + .lvl = 38, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = { + { + .iv = 60, + .lvl = 30, + .species = SPECIES_GLOOM, + }, + { + .iv = 60, + .lvl = 30, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = { + { + .iv = 70, + .lvl = 33, + .species = SPECIES_GLOOM, + }, + { + .iv = 70, + .lvl = 33, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = { + { + .iv = 80, + .lvl = 36, + .species = SPECIES_GLOOM, + }, + { + .iv = 80, + .lvl = 36, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = { + { + .iv = 90, + .lvl = 39, + .species = SPECIES_BELLOSSOM, + }, + { + .iv = 90, + .lvl = 39, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julio[] = { + { + .iv = 0, + .lvl = 21, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = { + { + .iv = 50, + .lvl = 35, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 50, + .lvl = 35, + .species = SPECIES_GOLBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = { + { + .iv = 50, + .lvl = 22, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 50, + .lvl = 22, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marc[] = { + { + .iv = 120, + .lvl = 8, + .species = SPECIES_GEODUDE, + }, + { + .iv = 130, + .lvl = 8, + .species = SPECIES_GEODUDE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenden[] = { + { + .iv = 100, + .lvl = 13, + .species = SPECIES_MACHOP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lilith[] = { + { + .iv = 150, + .lvl = 13, + .species = SPECIES_MEDITITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristian[] = { + { + .iv = 200, + .lvl = 13, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sylvia[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_MEDITITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonardo[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Athena[] = { + { + .iv = 100, + .lvl = 32, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE + }, + { + .iv = 100, + .lvl = 32, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harrison[] = { + { + .iv = 0, + .lvl = 35, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = { + { + .iv = 0, + .lvl = 20, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarence[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terry[] = { + { + .iv = 0, + .lvl = 37, + .species = SPECIES_GIRAFARIG, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nate[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_SPOINK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kathleen[] = { + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KADABRA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clifford[] = { + { + .iv = 0, + .lvl = 36, + .species = SPECIES_GIRAFARIG, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicholas[] = { + { + .iv = 0, + .lvl = 36, + .species = SPECIES_WOBBUFFET, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_BALTOY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_BALTOY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Macey[] = { + { + .iv = 0, + .lvl = 36, + .species = SPECIES_NATU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = { + { + .iv = 25, + .lvl = 13, + .species = SPECIES_LOTAD, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TORCHIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = { + { + .iv = 25, + .lvl = 13, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TREECKO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paxton[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SWELLOW, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabella[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = { + { + .iv = 50, + .lvl = 18, + .species = SPECIES_NUMEL, + }, + { + .iv = 50, + .lvl = 20, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 50, + .lvl = 22, + .species = SPECIES_NUMEL, + }, + { + .iv = 50, + .lvl = 22, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonathan[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_KECLEON, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = { + { + .iv = 25, + .lvl = 13, + .species = SPECIES_SLUGMA, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_MUDKIP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = { + { + .iv = 25, + .lvl = 13, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TREECKO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = { + { + .iv = 150, + .lvl = 37, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 38, + .species = SPECIES_CROBAT, + }, + { + .iv = 150, + .lvl = 39, + .species = SPECIES_CAMERUPT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = { + { + .iv = 150, + .lvl = 24, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 24, + .species = SPECIES_ZUBAT, + }, + { + .iv = 150, + .lvl = 25, + .species = SPECIES_CAMERUPT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = { + { + .iv = 0, + .lvl = 4, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 4, + .species = SPECIES_SHROOMISH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = { + { + .iv = 0, + .lvl = 6, + .species = SPECIES_LOTAD, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_SHROOMISH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = { + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = { + { + .iv = 100, + .lvl = 15, + .species = SPECIES_MARILL, + }, + { + .iv = 100, + .lvl = 15, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 100, + .lvl = 15, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = { + { + .iv = 10, + .lvl = 26, + .species = SPECIES_LOMBRE, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_SHROOMISH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = { + { + .iv = 20, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = { + { + .iv = 30, + .lvl = 32, + .species = SPECIES_LOMBRE, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = { + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_LOMBRE, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_BRELOOM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = { + { + .iv = 0, + .lvl = 16, + .species = SPECIES_ODDISH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = { + { + .iv = 100, + .lvl = 40, + .species = SPECIES_LUVDISC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = { + { + .iv = 100, + .lvl = 39, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = { + { + .iv = 0, + .lvl = 4, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 4, + .species = SPECIES_WURMPLE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = { + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = { + { + .iv = 50, + .lvl = 8, + .species = SPECIES_WURMPLE, + }, + { + .iv = 50, + .lvl = 8, + .species = SPECIES_NINCADA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = { + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINCADA, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINJASK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ILLUMISE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_NINJASK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = { + { + .iv = 0, + .lvl = 6, + .species = SPECIES_NINCADA, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_NINCADA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = { + { + .iv = 10, + .lvl = 27, + .species = SPECIES_NINJASK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = { + { + .iv = 20, + .lvl = 29, + .species = SPECIES_DUSTOX, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_NINJASK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = { + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SURSKIT, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_DUSTOX, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_NINJASK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = { + { + .iv = 40, + .lvl = 33, + .species = SPECIES_SURSKIT, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_NINJASK, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_DUSTOX, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_NINJASK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_NUMEL, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MACHOP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = { + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MACHOP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = { + { + .iv = 0, + .lvl = 22, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_GRAVELER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = { + { + .iv = 0, + .lvl = 8, + .species = SPECIES_GEODUDE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = { + { + .iv = 0, + .lvl = 20, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_BALTOY, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = { + { + .iv = 0, + .lvl = 9, + .species = SPECIES_WAILMER, + .moves = MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = { + { + .iv = 0, + .lvl = 10, + .species = SPECIES_PELIPPER, + .moves = MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_POOCHYENA, + .moves = MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = { + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MACHOP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = { + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GRAVELER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = { + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GEODUDE, + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GEODUDE, + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GRAVELER, + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GRAVELER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = { + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GEODUDE, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = { + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GOLEM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_DELCATTY, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_MANECTRIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = { + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LUVDISC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan1[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ILLUMISE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan2[] = { + { + .iv = 10, + .lvl = 30, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_ILLUMISE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan3[] = { + { + .iv = 20, + .lvl = 33, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_ILLUMISE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan4[] = { + { + .iv = 30, + .lvl = 36, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_ILLUMISE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan5[] = { + { + .iv = 40, + .lvl = 39, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 40, + .lvl = 39, + .species = SPECIES_ILLUMISE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = { + { + .iv = 0, + .lvl = 13, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Gerald[] = { + { + .iv = 100, + .lvl = 23, + .species = SPECIES_KECLEON, + .moves = MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = { + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MEDITITE, + .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MEDITITE, + .moves = MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Danielle[] = { + { + .iv = 100, + .lvl = 23, + .species = SPECIES_MEDITITE, + .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = { + { + .iv = 0, + .lvl = 28, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINJASK, + .moves = MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Riley[] = { + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINCADA, + .moves = MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = { + { + .iv = 150, + .lvl = 29, + .species = SPECIES_SWELLOW, + }, + { + .iv = 150, + .lvl = 29, + .species = SPECIES_XATU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ashley[] = { + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SWABLU, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SWABLU, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SWABLU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = { + { + .iv = 30, + .lvl = 16, + .species = SPECIES_RALTS, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = { + { + .iv = 150, + .lvl = 47, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 46, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 47, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 44, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 48, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = { + { + .iv = 150, + .lvl = 50, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 49, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 50, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 47, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 51, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = { + { + .iv = 150, + .lvl = 53, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 52, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 53, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 50, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 54, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = { + { + .iv = 150, + .lvl = 56, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 55, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 56, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 53, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 57, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan13[] = { + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_GROVYLE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan14[] = { + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_COMBUSKEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan15[] = { + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_MARSHTOMP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = { + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_GROVYLE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = { + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_COMBUSKEN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May13[] = { + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_MARSHTOMP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = { + { + .iv = 0, + .lvl = 30, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + }, + { + .iv = 0, + .lvl = 34, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_GYARADOS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = { + { + .iv = 100, + .lvl = 34, + .species = SPECIES_GLOOM, + }, + { + .iv = 100, + .lvl = 34, + .species = SPECIES_AZUMARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = { + { + .iv = 100, + .lvl = 34, + .species = SPECIES_SHIFTRY, + }, + { + .iv = 100, + .lvl = 34, + .species = SPECIES_NOSEPASS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji1[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = { + { + .iv = 0, + .lvl = 31, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_WAILMER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SWELLOW, + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SKARMORY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SPHEAL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CHINCHOU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SPINDA, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SPINDA, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = { + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SWABLU, + .moves = MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_NUMEL, + .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ROSELIA, + .moves = MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_GRAVELER, + .moves = MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_DUSTOX, + .moves = MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_BEAUTIFLY, + .moves = MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = { + { + .iv = 200, + .lvl = 39, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 200, + .lvl = 39, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = { + { + .iv = 210, + .lvl = 43, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 210, + .lvl = 43, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = { + { + .iv = 220, + .lvl = 46, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 220, + .lvl = 46, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = { + { + .iv = 230, + .lvl = 49, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 230, + .lvl = 49, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = { + { + .iv = 240, + .lvl = 52, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 240, + .lvl = 52, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = { + { + .iv = 0, + .lvl = 35, + .species = SPECIES_AZUMARILL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy1[] = { + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CHINCHOU, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy2[] = { + { + .iv = 0, + .lvl = 42, + .species = SPECIES_CHINCHOU, + }, + { + .iv = 0, + .lvl = 40, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy3[] = { + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy4[] = { + { + .iv = 0, + .lvl = 48, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 46, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy5[] = { + { + .iv = 0, + .lvl = 51, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 49, + .species = SPECIES_SHARPEDO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = { + { + .iv = 0, + .lvl = 27, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_FEEBAS, + }, + { + .iv = 0, + .lvl = 23, + .species = SPECIES_CARVANHA, + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Dawson[] = { + { + .iv = 0, + .lvl = 8, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_POOCHYENA, + .heldItem = ITEM_NONE + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Sarah[] = { + { + .iv = 0, + .lvl = 8, + .species = SPECIES_LOTAD, + .heldItem = ITEM_NONE + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darian[] = { + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MAGIKARP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hailey[] = { + { + .iv = 0, + .lvl = 13, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chandler[] = { + { + .iv = 0, + .lvl = 12, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonItemDefaultMoves gTrainerParty_Kaleb[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joseph[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_VOLTORB, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alyssa[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGNEMITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcos[] = { + { + .iv = 100, + .lvl = 15, + .species = SPECIES_VOLTORB, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rhett[] = { + { + .iv = 100, + .lvl = 15, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tyron[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SANDSHREW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celina[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bianca[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SHROOMISH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hayden[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophie[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_LOMBRE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Coby[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_SKARMORY, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SWELLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lawrence[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_BALTOY, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SANDSHREW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wyatt[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ARON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelina[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kai[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_BARBOACH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlotte[] = { + { + .iv = 0, + .lvl = 19, + .species = SPECIES_NUZLEAF, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Deandre[] = { + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ELECTRIKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = { + { + .iv = 0, + .lvl = 28, + .species = SPECIES_BALTOY, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = { + { + .iv = 0, + .lvl = 28, + .species = SPECIES_BALTOY, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_POOCHYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_BALTOY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MIGHTYENA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_BALTOY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha3[] = { + { + .iv = 75, + .lvl = 26, + .species = SPECIES_NUMEL, + }, + { + .iv = 75, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 75, + .lvl = 30, + .species = SPECIES_ZUBAT, + }, + { + .iv = 75, + .lvl = 33, + .species = SPECIES_CAMERUPT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_CAMERUPT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = { + { + .iv = 150, + .lvl = 42, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 43, + .species = SPECIES_CROBAT, + }, + { + .iv = 150, + .lvl = 44, + .species = SPECIES_CAMERUPT, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pete[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabelle[] = { + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MARILL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres1[] = { + { + .iv = 50, + .lvl = 25, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 50, + .lvl = 25, + .species = SPECIES_SANDSHREW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Josue[] = { + { + .iv = 50, + .lvl = 25, + .species = SPECIES_TAILLOW, + }, + { + .iv = 50, + .lvl = 25, + .species = SPECIES_WINGULL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camron[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory1[] = { + { + .iv = 0, + .lvl = 24, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_MACHOP, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carolina[] = { + { + .iv = 50, + .lvl = 24, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 50, + .lvl = 24, + .species = SPECIES_SWELLOW, + }, + { + .iv = 50, + .lvl = 24, + .species = SPECIES_MANECTRIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elijah[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SKARMORY, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SKARMORY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celia[] = { + { + .iv = 0, + .lvl = 22, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_LOMBRE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryan[] = { + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSLASH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Branden[] = { + { + .iv = 0, + .lvl = 22, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_NUZLEAF, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryant[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUMEL, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SLUGMA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shayla[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ROSELIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyra[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_DODUO, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_DODRIO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaiden[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NINJASK, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GULPIN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alix[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KADABRA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KIRLIA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Helene[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MEDITITE, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marlene[] = { + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MEDITITE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SPOINK, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Devan[] = { + { + .iv = 0, + .lvl = 8, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_GEODUDE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johnson[] = { + { + .iv = 0, + .lvl = 8, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_LOTAD, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melina[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_DODUO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandi[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_RALTS, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aisha[] = { + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MEDITITE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makayla[] = { + { + .iv = 0, + .lvl = 33, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MEDICHAM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fabian[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MANECTRIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dayton[] = { + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SLUGMA, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rachel[] = { + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GOLDEEN, + } +}; + +const struct TrainerMonNoItemCustomMoves gTrainerParty_Leonel[] = { + { + .iv = 100, + .lvl = 30, + .species = SPECIES_MANECTRIC, + .moves = MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Callie[] = { + { + .iv = 0, + .lvl = 28, + .species = SPECIES_MEDITITE, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_MAKUHITA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cale[] = { + { + .iv = 0, + .lvl = 29, + .species = SPECIES_DUSTOX, + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_BEAUTIFLY, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Myles[] = { + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_TROPIUS, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pat[] = { + { + .iv = 10, + .lvl = 25, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MARILL, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_GULPIN, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin1[] = { + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOUDRED, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_VIGOROTH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May14[] = { + { + .iv = 25, + .lvl = 13, + .species = SPECIES_LOTAD, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TORCHIC, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May15[] = { + { + .iv = 25, + .lvl = 13, + .species = SPECIES_TORKOAL, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_MUDKIP, + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne2[] = { + { + .iv = 255, + .lvl = 32, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 35, + .species = SPECIES_KABUTO, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 35, + .species = SPECIES_ONIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 37, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne3[] = { + { + .iv = 255, + .lvl = 37, + .species = SPECIES_OMANYTE, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF + }, + { + .iv = 255, + .lvl = 37, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_KABUTOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_ONIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne4[] = { + { + .iv = 255, + .lvl = 42, + .species = SPECIES_OMASTAR, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_KABUTOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_ONIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne5[] = { + { + .iv = 255, + .lvl = 47, + .species = SPECIES_AERODACTYL, + .heldItem = ITEM_NONE, + .moves = MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_OMASTAR, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_KABUTOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_STEELIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 52, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Brawly2[] = { + { + .iv = 255, + .lvl = 33, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 33, + .species = SPECIES_MEDITITE, + .heldItem = ITEM_NONE, + .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 35, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 37, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Brawly3[] = { + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MEDICHAM, + .heldItem = ITEM_NONE, + .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Brawly4[] = { + { + .iv = 255, + .lvl = 40, + .species = SPECIES_HITMONCHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MEDICHAM, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Brawly5[] = { + { + .iv = 255, + .lvl = 46, + .species = SPECIES_HITMONLEE, + .heldItem = ITEM_NONE, + .moves = MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_HITMONCHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MEDICHAM, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 52, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Wattson2[] = { + { + .iv = 255, + .lvl = 36, + .species = SPECIES_MAREEP, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 36, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Wattson3[] = { + { + .iv = 255, + .lvl = 39, + .species = SPECIES_PIKACHU, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_FLAAFFY, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Wattson4[] = { + { + .iv = 255, + .lvl = 44, + .species = SPECIES_RAICHU, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_AMPHAROS, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Wattson5[] = { + { + .iv = 255, + .lvl = 50, + .species = SPECIES_ELECTABUZZ, + .heldItem = ITEM_NONE, + .moves = MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_RAICHU, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_AMPHAROS, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Flannery2[] = { + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 36, + .species = SPECIES_PONYTA, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Flannery3[] = { + { + .iv = 255, + .lvl = 41, + .species = SPECIES_GROWLITHE, + .heldItem = ITEM_NONE, + .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_PONYTA, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Flannery4[] = { + { + .iv = 255, + .lvl = 46, + .species = SPECIES_HOUNDOUR, + .heldItem = ITEM_NONE, + .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_GROWLITHE, + .heldItem = ITEM_NONE, + .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_RAPIDASH, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Flannery5[] = { + { + .iv = 255, + .lvl = 51, + .species = SPECIES_ARCANINE, + .heldItem = ITEM_NONE, + .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_HOUNDOOM, + .heldItem = ITEM_NONE, + .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_RAPIDASH, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Norman2[] = { + { + .iv = 255, + .lvl = 42, + .species = SPECIES_CHANSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Norman3[] = { + { + .iv = 255, + .lvl = 47, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_CHANSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_KANGASKHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Norman4[] = { + { + .iv = 255, + .lvl = 52, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 52, + .species = SPECIES_BLISSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_KANGASKHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Norman5[] = { + { + .iv = 255, + .lvl = 57, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 57, + .species = SPECIES_BLISSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_KANGASKHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL + }, + { + .iv = 255, + .lvl = 57, + .species = SPECIES_TAUROS, + .heldItem = ITEM_NONE, + .moves = MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Winona2[] = { + { + .iv = 255, + .lvl = 40, + .species = SPECIES_DRATINI, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Winona3[] = { + { + .iv = 255, + .lvl = 43, + .species = SPECIES_HOOTHOOT, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_DRAGONAIR, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Winona4[] = { + { + .iv = 255, + .lvl = 48, + .species = SPECIES_NOCTOWL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_DRAGONAIR, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Winona5[] = { + { + .iv = 255, + .lvl = 53, + .species = SPECIES_NOCTOWL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER + }, + { + .iv = 255, + .lvl = 54, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_DRAGONITE, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza2[] = { + { + .iv = 255, + .lvl = 48, + .species = SPECIES_SLOWPOKE, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza3[] = { + { + .iv = 255, + .lvl = 53, + .species = SPECIES_DROWZEE, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_SLOWPOKE, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 54, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 54, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza4[] = { + { + .iv = 255, + .lvl = 58, + .species = SPECIES_HYPNO, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 59, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_SLOWPOKE, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 59, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza5[] = { + { + .iv = 255, + .lvl = 63, + .species = SPECIES_HYPNO, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 64, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_SLOWKING, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 64, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 65, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 65, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Juan2[] = { + { + .iv = 255, + .lvl = 46, + .species = SPECIES_POLIWAG, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Juan3[] = { + { + .iv = 255, + .lvl = 50, + .species = SPECIES_POLIWHIRL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Juan4[] = { + { + .iv = 255, + .lvl = 56, + .species = SPECIES_LAPRAS, + .heldItem = ITEM_NONE, + .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_POLIWHIRL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 61, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Juan5[] = { + { + .iv = 255, + .lvl = 61, + .species = SPECIES_LAPRAS, + .heldItem = ITEM_NONE, + .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 61, + .species = SPECIES_POLITOED, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 66, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Angelo[] = { + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ILLUMISE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_VOLBEAT, + .heldItem = ITEM_NONE, + .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darius[] = { + { + .iv = 200, + .lvl = 30, + .species = SPECIES_TROPIUS, + } +}; + +const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = { + { + .iv = 255, + .lvl = 77, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING + }, + { + .iv = 255, + .lvl = 75, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 76, + .species = SPECIES_AGGRON, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW + }, + { + .iv = 255, + .lvl = 76, + .species = SPECIES_CRADILY, + .heldItem = ITEM_NONE, + .moves = MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY + }, + { + .iv = 255, + .lvl = 76, + .species = SPECIES_ARMALDO, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH + }, + { + .iv = 255, + .lvl = 78, + .species = SPECIES_METAGROSS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anabel[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spenser[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greta[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Noland[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucy[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres2[] = { + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SANDSHREW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres3[] = { + { + .iv = 20, + .lvl = 33, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SANDSHREW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres4[] = { + { + .iv = 30, + .lvl = 35, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_SANDSHREW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres5[] = { + { + .iv = 40, + .lvl = 37, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SANDSLASH, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SANDSLASH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory2[] = { + { + .iv = 10, + .lvl = 30, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_MACHOP, + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory3[] = { + { + .iv = 20, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 20, + .lvl = 32, + .species = SPECIES_MACHOP, + }, + { + .iv = 20, + .lvl = 32, + .species = SPECIES_TENTACOOL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory4[] = { + { + .iv = 30, + .lvl = 34, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 34, + .species = SPECIES_MACHOP, + }, + { + .iv = 30, + .lvl = 34, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory5[] = { + { + .iv = 40, + .lvl = 36, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_MACHOKE, + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_TENTACRUEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo2[] = { + { + .iv = 10, + .lvl = 37, + .species = SPECIES_STARYU, + }, + { + .iv = 10, + .lvl = 37, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo3[] = { + { + .iv = 20, + .lvl = 39, + .species = SPECIES_WINGULL, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_STARYU, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo4[] = { + { + .iv = 30, + .lvl = 41, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_STARYU, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_STARYU, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo5[] = { + { + .iv = 40, + .lvl = 43, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_STARMIE, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_STARMIE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji2[] = { + { + .iv = 10, + .lvl = 37, + .species = SPECIES_MACHOKE, + }, + { + .iv = 10, + .lvl = 37, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji3[] = { + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MACHOKE, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji4[] = { + { + .iv = 30, + .lvl = 41, + .species = SPECIES_HARIYAMA, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_MACHOKE, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_MACHOKE, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji5[] = { + { + .iv = 40, + .lvl = 43, + .species = SPECIES_HARIYAMA, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_MACHAMP, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_MACHAMP, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin2[] = { + { + .iv = 110, + .lvl = 35, + .species = SPECIES_LOUDRED, + }, + { + .iv = 110, + .lvl = 35, + .species = SPECIES_VIGOROTH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin3[] = { + { + .iv = 120, + .lvl = 37, + .species = SPECIES_SPINDA, + }, + { + .iv = 120, + .lvl = 37, + .species = SPECIES_LOUDRED, + }, + { + .iv = 120, + .lvl = 37, + .species = SPECIES_VIGOROTH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin4[] = { + { + .iv = 130, + .lvl = 39, + .species = SPECIES_SPINDA, + }, + { + .iv = 130, + .lvl = 39, + .species = SPECIES_LOUDRED, + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_VIGOROTH, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin5[] = { + { + .iv = 140, + .lvl = 41, + .species = SPECIES_SPINDA, + }, + { + .iv = 140, + .lvl = 41, + .species = SPECIES_EXPLOUD, + }, + { + .iv = 140, + .lvl = 41, + .species = SPECIES_SLAKING, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando2[] = { + { + .iv = 10, + .lvl = 35, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 35, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 35, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando3[] = { + { + .iv = 20, + .lvl = 37, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 20, + .lvl = 37, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 20, + .lvl = 37, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando4[] = { + { + .iv = 30, + .lvl = 39, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 30, + .lvl = 39, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 30, + .lvl = 39, + .species = SPECIES_LOUDRED, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando5[] = { + { + .iv = 40, + .lvl = 41, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_EXPLOUD, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer2[] = { + { + .iv = 10, + .lvl = 26, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_NUMEL, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer3[] = { + { + .iv = 20, + .lvl = 28, + .species = SPECIES_MACHOP, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_NUMEL, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_GRAVELER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer4[] = { + { + .iv = 30, + .lvl = 30, + .species = SPECIES_MACHOP, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_NUMEL, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer5[] = { + { + .iv = 40, + .lvl = 33, + .species = SPECIES_MACHOKE, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_CAMERUPT, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GOLEM, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle2[] = { + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SKITTY, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_LOTAD, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SEEDOT, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_TAILLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle3[] = { + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SKITTY, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_LINOONE, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_LOMBRE, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_NUZLEAF, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_TAILLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle4[] = { + { + .iv = 30, + .lvl = 35, + .species = SPECIES_DELCATTY, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_LINOONE, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_LOMBRE, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_NUZLEAF, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_SWELLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle5[] = { + { + .iv = 40, + .lvl = 37, + .species = SPECIES_DELCATTY, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_LINOONE, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SHIFTRY, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SWELLOW, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia2[] = { + { + .iv = 10, + .lvl = 34, + .species = SPECIES_WAILMER, + }, + { + .iv = 10, + .lvl = 34, + .species = SPECIES_HORSEA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia3[] = { + { + .iv = 20, + .lvl = 36, + .species = SPECIES_LUVDISC, + }, + { + .iv = 20, + .lvl = 36, + .species = SPECIES_WAILMER, + }, + { + .iv = 20, + .lvl = 36, + .species = SPECIES_SEADRA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia4[] = { + { + .iv = 30, + .lvl = 38, + .species = SPECIES_LUVDISC, + }, + { + .iv = 30, + .lvl = 38, + .species = SPECIES_WAILMER, + }, + { + .iv = 30, + .lvl = 38, + .species = SPECIES_SEADRA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia5[] = { + { + .iv = 40, + .lvl = 40, + .species = SPECIES_LUVDISC, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_WAILORD, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_KINGDRA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mariela[] = { + { + .iv = 0, + .lvl = 41, + .species = SPECIES_CHIMECHO, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alvaro[] = { + { + .iv = 0, + .lvl = 41, + .species = SPECIES_BANETTE, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_KADABRA, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Everett[] = { + { + .iv = 0, + .lvl = 41, + .species = SPECIES_WOBBUFFET, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Red[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_CHARMANDER, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leaf[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BULBASAUR, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan16[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_GROUDON, + } +}; + +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May16[] = { + { + .iv = 0, + .lvl = 5, + .species = SPECIES_KYOGRE, + } +}; + diff --git a/src/data/trainers.h b/src/data/trainers.h new file mode 100644 index 000000000..19e210acc --- /dev/null +++ b/src/data/trainers.h @@ -0,0 +1,11971 @@ +const struct Trainer gTrainers[] = { + [TRAINER_NONE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _(""), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 0, + .party = {.NoItemDefaultMoves = NULL } + }, + + [TRAINER_SAWYER_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("SAWYER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer1 } + }, + + [TRAINER_GRUNT_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 } + }, + + [TRAINER_GRUNT_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 } + }, + + [TRAINER_GRUNT_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 } + }, + + [TRAINER_GRUNT_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 } + }, + + [TRAINER_GRUNT_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 } + }, + + [TRAINER_GRUNT_6] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 } + }, + + [TRAINER_GRUNT_7] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 } + }, + + [TRAINER_GABRIELLE_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("GABRIELLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle1 } + }, + + [TRAINER_GRUNT_8] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 } + }, + + [TRAINER_MARCEL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("MARCEL"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Marcel } + }, + + [TRAINER_ALBERTO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("ALBERTO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Alberto } + }, + + [TRAINER_ED] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COLLECTOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_COLLECTOR, + .trainerName = _("ED"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Ed } + }, + + [TRAINER_GRUNT_9] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 } + }, + + [TRAINER_DECLAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("DECLAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Declan } + }, + + [TRAINER_GRUNT_10] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 } + }, + + [TRAINER_GRUNT_11] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 } + }, + + [TRAINER_GRUNT_12] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 } + }, + + [TRAINER_GRUNT_13] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 } + }, + + [TRAINER_GRUNT_14] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 } + }, + + [TRAINER_GRUNT_15] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 } + }, + + [TRAINER_GRUNT_16] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 } + }, + + [TRAINER_GRUNT_17] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 } + }, + + [TRAINER_GRUNT_18] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 } + }, + + [TRAINER_GRUNT_19] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 } + }, + + [TRAINER_GRUNT_20] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 } + }, + + [TRAINER_GRUNT_21] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 } + }, + + [TRAINER_GRUNT_22] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 } + }, + + [TRAINER_FREDRICK] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_M, + .trainerName = _("FREDRICK"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Fredrick } + }, + + [TRAINER_MATT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AQUA_ADMIN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_ADMIN_M, + .trainerName = _("MATT"), + .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Matt } + }, + + [TRAINER_ZANDER] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("ZANDER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Zander } + }, + + [TRAINER_SHELLY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AQUA_ADMIN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_ADMIN_F, + .trainerName = _("SHELLY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 } + }, + + [TRAINER_SHELLY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AQUA_ADMIN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_ADMIN_F, + .trainerName = _("SHELLY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 } + }, + + [TRAINER_ARCHIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AQUA_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE, + .trainerName = _("ARCHIE"), + .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Archie } + }, + + [TRAINER_LEAH] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("LEAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Leah } + }, + + [TRAINER_DAISY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AROMA_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerName = _("DAISY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Daisy } + }, + + [TRAINER_ROSE_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AROMA_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerName = _("ROSE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 } + }, + + [TRAINER_FELIX] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("FELIX"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Felix } + }, + + [TRAINER_VIOLET] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AROMA_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerName = _("VIOLET"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Violet } + }, + + [TRAINER_ROSE_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AROMA_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerName = _("ROSE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 } + }, + + [TRAINER_ROSE_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AROMA_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerName = _("ROSE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 } + }, + + [TRAINER_ROSE_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AROMA_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerName = _("ROSE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 } + }, + + [TRAINER_ROSE_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AROMA_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerName = _("ROSE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 } + }, + + [TRAINER_DUSTY_1] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("DUSTY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 } + }, + + [TRAINER_CHIP] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("CHIP"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemCustomMoves = gTrainerParty_Chip } + }, + + [TRAINER_FOSTER] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("FOSTER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Foster } + }, + + [TRAINER_DUSTY_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("DUSTY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 } + }, + + [TRAINER_DUSTY_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("DUSTY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 } + }, + + [TRAINER_DUSTY_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("DUSTY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 } + }, + + [TRAINER_DUSTY_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("DUSTY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 } + }, + + [TRAINER_GABBY_AND_TY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_INTERVIEWER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, + .trainerPic = TRAINER_PIC_INTERVIEWER, + .trainerName = _("GABBY & TY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 } + }, + + [TRAINER_GABBY_AND_TY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_INTERVIEWER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, + .trainerPic = TRAINER_PIC_INTERVIEWER, + .trainerName = _("GABBY & TY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 } + }, + + [TRAINER_GABBY_AND_TY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_INTERVIEWER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, + .trainerPic = TRAINER_PIC_INTERVIEWER, + .trainerName = _("GABBY & TY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 } + }, + + [TRAINER_GABBY_AND_TY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_INTERVIEWER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, + .trainerPic = TRAINER_PIC_INTERVIEWER, + .trainerName = _("GABBY & TY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 } + }, + + [TRAINER_GABBY_AND_TY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_INTERVIEWER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, + .trainerPic = TRAINER_PIC_INTERVIEWER, + .trainerName = _("GABBY & TY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 } + }, + + [TRAINER_GABBY_AND_TY_6] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_INTERVIEWER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER, + .trainerPic = TRAINER_PIC_INTERVIEWER, + .trainerName = _("GABBY & TY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 } + }, + + [TRAINER_LOLA_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_F, + .trainerName = _("LOLA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 } + }, + + [TRAINER_AUSTINA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_F, + .trainerName = _("AUSTINA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Austina } + }, + + [TRAINER_GWEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_F, + .trainerName = _("GWEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Gwen } + }, + + [TRAINER_LOLA_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_F, + .trainerName = _("LOLA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 } + }, + + [TRAINER_LOLA_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_F, + .trainerName = _("LOLA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 } + }, + + [TRAINER_LOLA_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_F, + .trainerName = _("LOLA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 } + }, + + [TRAINER_LOLA_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_F, + .trainerName = _("LOLA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 } + }, + + [TRAINER_RICKY_1] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_TUBER_2, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_M, + .trainerName = _("RICKY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 } + }, + + [TRAINER_SIMON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_2, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_M, + .trainerName = _("SIMON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Simon } + }, + + [TRAINER_CHARLIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_2, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_M, + .trainerName = _("CHARLIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Charlie } + }, + + [TRAINER_RICKY_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_TUBER_2, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_M, + .trainerName = _("RICKY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 } + }, + + [TRAINER_RICKY_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_TUBER_2, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_M, + .trainerName = _("RICKY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 } + }, + + [TRAINER_RICKY_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_TUBER_2, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_M, + .trainerName = _("RICKY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 } + }, + + [TRAINER_RICKY_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_TUBER_2, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_M, + .trainerName = _("RICKY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 } + }, + + [TRAINER_RANDALL] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("RANDALL"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Randall } + }, + + [TRAINER_PARKER] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("PARKER"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Parker } + }, + + [TRAINER_GEORGE] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("GEORGE"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_George } + }, + + [TRAINER_BERKE] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("BERKE"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Berke } + }, + + [TRAINER_BRAXTON] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("BRAXTON"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.NoItemCustomMoves = gTrainerParty_Braxton } + }, + + [TRAINER_VINCENT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("VINCENT"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Vincent } + }, + + [TRAINER_LEROY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("LEROY"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Leroy } + }, + + [TRAINER_WILTON_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("WILTON"), + .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 } + }, + + [TRAINER_EDGAR] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("EDGAR"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Edgar } + }, + + [TRAINER_ALBERT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("ALBERT"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Albert } + }, + + [TRAINER_SAMUEL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("SAMUEL"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Samuel } + }, + + [TRAINER_VITO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("VITO"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Vito } + }, + + [TRAINER_OWEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("OWEN"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Owen } + }, + + [TRAINER_WILTON_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("WILTON"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 } + }, + + [TRAINER_WILTON_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("WILTON"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 } + }, + + [TRAINER_WILTON_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("WILTON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 } + }, + + [TRAINER_WILTON_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("WILTON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 } + }, + + [TRAINER_WARREN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("WARREN"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Warren } + }, + + [TRAINER_MARY] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("MARY"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Mary } + }, + + [TRAINER_ALEXIA] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("ALEXIA"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Alexia } + }, + + [TRAINER_JODY] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("JODY"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Jody } + }, + + [TRAINER_WENDY] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("WENDY"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 3, + .party = {.NoItemCustomMoves = gTrainerParty_Wendy } + }, + + [TRAINER_KEIRA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("KEIRA"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Keira } + }, + + [TRAINER_BROOKE_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("BROOKE"), + .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 } + }, + + [TRAINER_JENNIFER] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("JENNIFER"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer } + }, + + [TRAINER_HOPE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("HOPE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Hope } + }, + + [TRAINER_SHANNON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("SHANNON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Shannon } + }, + + [TRAINER_MICHELLE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("MICHELLE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Michelle } + }, + + [TRAINER_CAROLINE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("CAROLINE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Caroline } + }, + + [TRAINER_JULIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("JULIE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Julie } + }, + + [TRAINER_BROOKE_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("BROOKE"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 } + }, + + [TRAINER_BROOKE_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("BROOKE"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 } + }, + + [TRAINER_BROOKE_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("BROOKE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 } + }, + + [TRAINER_BROOKE_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("BROOKE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 } + }, + + [TRAINER_PATRICIA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("PATRICIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Patricia } + }, + + [TRAINER_KINDRA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("KINDRA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Kindra } + }, + + [TRAINER_TAMMY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("TAMMY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Tammy } + }, + + [TRAINER_VALERIE_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("VALERIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 } + }, + + [TRAINER_TASHA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("TASHA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Tasha } + }, + + [TRAINER_VALERIE_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("VALERIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 } + }, + + [TRAINER_VALERIE_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("VALERIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 } + }, + + [TRAINER_VALERIE_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("VALERIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 } + }, + + [TRAINER_VALERIE_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("VALERIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 } + }, + + [TRAINER_CINDY_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("CINDY"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 } + }, + + [TRAINER_DAPHNE] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("DAPHNE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemCustomMoves = gTrainerParty_Daphne } + }, + + [TRAINER_GRUNT_23] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 } + }, + + [TRAINER_CINDY_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("CINDY"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Cindy2 } + }, + + [TRAINER_BRIANNA] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("BRIANNA"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Brianna } + }, + + [TRAINER_NAOMI] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("NAOMI"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Naomi } + }, + + [TRAINER_CINDY_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("CINDY"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 } + }, + + [TRAINER_CINDY_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("CINDY"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 } + }, + + [TRAINER_CINDY_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("CINDY"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 } + }, + + [TRAINER_CINDY_6] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("CINDY"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Cindy6 } + }, + + [TRAINER_MELISSA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("MELISSA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Melissa } + }, + + [TRAINER_SHEILA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("SHEILA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Sheila } + }, + + [TRAINER_SHIRLEY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("SHIRLEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Shirley } + }, + + [TRAINER_JESSICA_1] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("JESSICA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 } + }, + + [TRAINER_CONNIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("CONNIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Connie } + }, + + [TRAINER_BRIDGET] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("BRIDGET"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Bridget } + }, + + [TRAINER_OLIVIA] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("OLIVIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemCustomMoves = gTrainerParty_Olivia } + }, + + [TRAINER_TIFFANY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("TIFFANY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany } + }, + + [TRAINER_JESSICA_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("JESSICA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 } + }, + + [TRAINER_JESSICA_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("JESSICA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 } + }, + + [TRAINER_JESSICA_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("JESSICA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 } + }, + + [TRAINER_JESSICA_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("JESSICA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 } + }, + + [TRAINER_WINSTON_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_RICH_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_RICH_BOY, + .trainerName = _("WINSTON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Winston1 } + }, + + [TRAINER_MOLLIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_F, + .trainerName = _("MOLLIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Mollie } + }, + + [TRAINER_GARRET] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_RICH_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_RICH_BOY, + .trainerName = _("GARRET"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Garret } + }, + + [TRAINER_WINSTON_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_RICH_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_RICH_BOY, + .trainerName = _("WINSTON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Winston2 } + }, + + [TRAINER_WINSTON_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_RICH_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_RICH_BOY, + .trainerName = _("WINSTON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Winston3 } + }, + + [TRAINER_WINSTON_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_RICH_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_RICH_BOY, + .trainerName = _("WINSTON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Winston4 } + }, + + [TRAINER_WINSTON_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_RICH_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_RICH_BOY, + .trainerName = _("WINSTON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Winston5 } + }, + + [TRAINER_STEVE_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_POKEMANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_POKEMANIAC, + .trainerName = _("STEVE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 } + }, + + [TRAINER_THALIA_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("THALIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Thalia1 } + }, + + [TRAINER_MARK] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_POKEMANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_POKEMANIAC, + .trainerName = _("MARK"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Mark } + }, + + [TRAINER_GRUNT_24] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 } + }, + + [TRAINER_STEVE_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_POKEMANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_POKEMANIAC, + .trainerName = _("STEVE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 } + }, + + [TRAINER_STEVE_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_POKEMANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_POKEMANIAC, + .trainerName = _("STEVE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 } + }, + + [TRAINER_STEVE_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_POKEMANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_POKEMANIAC, + .trainerName = _("STEVE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 } + }, + + [TRAINER_STEVE_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_POKEMANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_POKEMANIAC, + .trainerName = _("STEVE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 } + }, + + [TRAINER_LUIS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("LUIS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Luis } + }, + + [TRAINER_DOMINIK] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("DOMINIK"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Dominik } + }, + + [TRAINER_DOUGLAS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("DOUGLAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Douglas } + }, + + [TRAINER_DARRIN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("DARRIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Darrin } + }, + + [TRAINER_TONY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("TONY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 } + }, + + [TRAINER_JEROME] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("JEROME"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jerome } + }, + + [TRAINER_MATTHEW] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("MATTHEW"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Matthew } + }, + + [TRAINER_DAVID] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("DAVID"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_David } + }, + + [TRAINER_SPENCER] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("SPENCER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Spencer } + }, + + [TRAINER_ROLAND] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("ROLAND"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Roland } + }, + + [TRAINER_NOLEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("NOLEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Nolen } + }, + + [TRAINER_STAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("STAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Stan } + }, + + [TRAINER_BARRY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("BARRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Barry } + }, + + [TRAINER_DEAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("DEAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Dean } + }, + + [TRAINER_RODNEY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("RODNEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Rodney } + }, + + [TRAINER_RICHARD] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("RICHARD"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Richard } + }, + + [TRAINER_HERMAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("HERMAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Herman } + }, + + [TRAINER_SANTIAGO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("SANTIAGO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Santiago } + }, + + [TRAINER_GILBERT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("GILBERT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert } + }, + + [TRAINER_FRANKLIN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("FRANKLIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Franklin } + }, + + [TRAINER_KEVIN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("KEVIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Kevin } + }, + + [TRAINER_JACK] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("JACK"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jack } + }, + + [TRAINER_DUDLEY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("DUDLEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Dudley } + }, + + [TRAINER_CHAD] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("CHAD"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Chad } + }, + + [TRAINER_TONY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("TONY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 } + }, + + [TRAINER_TONY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("TONY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 } + }, + + [TRAINER_TONY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("TONY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 } + }, + + [TRAINER_TONY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("TONY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 } + }, + + [TRAINER_TAKAO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("TAKAO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Takao } + }, + + [TRAINER_HITOSHI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("HITOSHI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi } + }, + + [TRAINER_KIYO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("KIYO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo } + }, + + [TRAINER_KOICHI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("KOICHI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Koichi } + }, + + [TRAINER_NOB_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("NOB"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 } + }, + + [TRAINER_NOB_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("NOB"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 } + }, + + [TRAINER_NOB_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("NOB"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 } + }, + + [TRAINER_NOB_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("NOB"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 } + }, + + [TRAINER_NOB_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("NOB"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.ItemDefaultMoves = gTrainerParty_Nob5 } + }, + + [TRAINER_YUJI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("YUJI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Yuji } + }, + + [TRAINER_DAISUKE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("DAISUKE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke } + }, + + [TRAINER_ATSUSHI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("ATSUSHI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi } + }, + + [TRAINER_KIRK] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("KIRK"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Kirk } + }, + + [TRAINER_GRUNT_25] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 } + }, + + [TRAINER_GRUNT_26] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 } + }, + + [TRAINER_SHAWN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("SHAWN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shawn } + }, + + [TRAINER_FERNANDO_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("FERNANDO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Fernando1 } + }, + + [TRAINER_DALTON_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("DALTON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 } + }, + + [TRAINER_DALTON_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("DALTON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 } + }, + + [TRAINER_DALTON_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("DALTON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 } + }, + + [TRAINER_DALTON_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("DALTON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 } + }, + + [TRAINER_DALTON_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("DALTON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 } + }, + + [TRAINER_COLE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("COLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Cole } + }, + + [TRAINER_JEFF] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("JEFF"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jeff } + }, + + [TRAINER_AXLE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("AXLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Axle } + }, + + [TRAINER_JACE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("JACE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jace } + }, + + [TRAINER_KEEGAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("KEEGAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Keegan } + }, + + [TRAINER_BERNIE_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("BERNIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 } + }, + + [TRAINER_BERNIE_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("BERNIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 } + }, + + [TRAINER_BERNIE_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("BERNIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 } + }, + + [TRAINER_BERNIE_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("BERNIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 } + }, + + [TRAINER_BERNIE_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("BERNIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 } + }, + + [TRAINER_DREW] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("DREW"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Drew } + }, + + [TRAINER_BEAU] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("BEAU"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemCustomMoves = gTrainerParty_Beau } + }, + + [TRAINER_LARRY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("LARRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Larry } + }, + + [TRAINER_SHANE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("SHANE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shane } + }, + + [TRAINER_JUSTIN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("JUSTIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Justin } + }, + + [TRAINER_ETHAN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("ETHAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 } + }, + + [TRAINER_AUTUMN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("AUTUMN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Autumn } + }, + + [TRAINER_TRAVIS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("TRAVIS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Travis } + }, + + [TRAINER_ETHAN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("ETHAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 } + }, + + [TRAINER_ETHAN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("ETHAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 } + }, + + [TRAINER_ETHAN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("ETHAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 } + }, + + [TRAINER_ETHAN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("ETHAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 } + }, + + [TRAINER_BRENT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("BRENT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Brent } + }, + + [TRAINER_DONALD] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("DONALD"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Donald } + }, + + [TRAINER_TAYLOR] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("TAYLOR"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Taylor } + }, + + [TRAINER_JEFFREY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("JEFFREY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jeffrey1 } + }, + + [TRAINER_DEREK] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("DEREK"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Derek } + }, + + [TRAINER_JEFFREY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("JEFFREY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jeffrey2 } + }, + + [TRAINER_JEFFREY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("JEFFREY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jeffrey3 } + }, + + [TRAINER_JEFFREY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("JEFFREY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Jeffrey4 } + }, + + [TRAINER_JEFFREY_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("JEFFREY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 5, + .party = {.ItemDefaultMoves = gTrainerParty_Jeffrey5 } + }, + + [TRAINER_EDWARD] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("EDWARD"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Edward } + }, + + [TRAINER_PRESTON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("PRESTON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Preston } + }, + + [TRAINER_VIRGIL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("VIRGIL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Virgil } + }, + + [TRAINER_BLAKE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("BLAKE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Blake } + }, + + [TRAINER_WILLIAM] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("WILLIAM"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_William } + }, + + [TRAINER_JOSHUA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("JOSHUA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Joshua } + }, + + [TRAINER_CAMERON_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("CAMERON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 } + }, + + [TRAINER_CAMERON_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("CAMERON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 } + }, + + [TRAINER_CAMERON_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("CAMERON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 } + }, + + [TRAINER_CAMERON_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("CAMERON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 } + }, + + [TRAINER_CAMERON_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("CAMERON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 } + }, + + [TRAINER_JACLYN] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("JACLYN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn } + }, + + [TRAINER_HANNAH] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("HANNAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Hannah } + }, + + [TRAINER_SAMANTHA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("SAMANTHA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Samantha } + }, + + [TRAINER_MAURA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("MAURA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Maura } + }, + + [TRAINER_KAYLA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("KAYLA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Kayla } + }, + + [TRAINER_ALEXIS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("ALEXIS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Alexis } + }, + + [TRAINER_JACKI_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("JACKI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 } + }, + + [TRAINER_JACKI_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("JACKI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 } + }, + + [TRAINER_JACKI_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("JACKI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 } + }, + + [TRAINER_JACKI_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("JACKI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 } + }, + + [TRAINER_JACKI_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("JACKI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 } + }, + + [TRAINER_WALTER_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("WALTER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 } + }, + + [TRAINER_MICAH] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("MICAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Micah } + }, + + [TRAINER_THOMAS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("THOMAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Thomas } + }, + + [TRAINER_WALTER_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("WALTER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 } + }, + + [TRAINER_WALTER_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("WALTER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Walter3 } + }, + + [TRAINER_WALTER_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("WALTER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Walter4 } + }, + + [TRAINER_WALTER_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("WALTER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemCustomMoves = gTrainerParty_Walter5 } + }, + + [TRAINER_SIDNEY] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, + .trainerPic = TRAINER_PIC_ELITE_FOUR_SIDNEY, + .trainerName = _("SIDNEY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xf, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Sidney } + }, + + [TRAINER_PHOEBE] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, + .trainerPic = TRAINER_PIC_ELITE_FOUR_PHOEBE, + .trainerName = _("PHOEBE"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Phoebe } + }, + + [TRAINER_GLACIA] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, + .trainerPic = TRAINER_PIC_ELITE_FOUR_GLACIA, + .trainerName = _("GLACIA"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Glacia } + }, + + [TRAINER_DRAKE] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_ELITE_FOUR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR, + .trainerPic = TRAINER_PIC_ELITE_FOUR_DRAKE, + .trainerName = _("DRAKE"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Drake } + }, + + [TRAINER_ROXANNE_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_ROXANNE, + .trainerName = _("ROXANNE"), + .items = {ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.ItemCustomMoves = gTrainerParty_Roxanne1 } + }, + + [TRAINER_BRAWLY_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_BRAWLY, + .trainerName = _("BRAWLY"), + .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.ItemCustomMoves = gTrainerParty_Brawly1 } + }, + + [TRAINER_WATTSON_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_WATTSON, + .trainerName = _("WATTSON"), + .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Wattson1 } + }, + + [TRAINER_FLANNERY_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_FLANNERY, + .trainerName = _("FLANNERY"), + .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Flannery1 } + }, + + [TRAINER_NORMAN_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_NORMAN, + .trainerName = _("NORMAN"), + .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Norman1 } + }, + + [TRAINER_WINONA_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_WINONA, + .trainerName = _("WINONA"), + .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x17, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Winona1 } + }, + + [TRAINER_TATE_AND_LIZA_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, + .trainerName = _("TATE&LIZA"), + .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza1 } + }, + + [TRAINER_JUAN_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_JUAN, + .trainerName = _("JUAN"), + .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Juan1 } + }, + + [TRAINER_JERRY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SCHOOL_KID_M, + .trainerName = _("JERRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 } + }, + + [TRAINER_TED] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SCHOOL_KID_M, + .trainerName = _("TED"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Ted } + }, + + [TRAINER_PAUL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SCHOOL_KID_M, + .trainerName = _("PAUL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Paul } + }, + + [TRAINER_JERRY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SCHOOL_KID_M, + .trainerName = _("JERRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 } + }, + + [TRAINER_JERRY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SCHOOL_KID_M, + .trainerName = _("JERRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 } + }, + + [TRAINER_JERRY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SCHOOL_KID_M, + .trainerName = _("JERRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 } + }, + + [TRAINER_JERRY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SCHOOL_KID_M, + .trainerName = _("JERRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 } + }, + + [TRAINER_KAREN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_SCHOOL_KID_F, + .trainerName = _("KAREN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 } + }, + + [TRAINER_GEORGIA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_SCHOOL_KID_F, + .trainerName = _("GEORGIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Georgia } + }, + + [TRAINER_KAREN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_SCHOOL_KID_F, + .trainerName = _("KAREN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 } + }, + + [TRAINER_KAREN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_SCHOOL_KID_F, + .trainerName = _("KAREN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 } + }, + + [TRAINER_KAREN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_SCHOOL_KID_F, + .trainerName = _("KAREN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 } + }, + + [TRAINER_KAREN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SCHOOL_KID, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_SCHOOL_KID_F, + .trainerName = _("KAREN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 } + }, + + [TRAINER_KATE_AND_JOY] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_SR_AND_JR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_SR_AND_JR, + .trainerName = _("KATE & JOY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy } + }, + + [TRAINER_ANNA_AND_MEG_1] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_SR_AND_JR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_SR_AND_JR, + .trainerName = _("ANNA & MEG"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 } + }, + + [TRAINER_ANNA_AND_MEG_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_SR_AND_JR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_SR_AND_JR, + .trainerName = _("ANNA & MEG"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 } + }, + + [TRAINER_ANNA_AND_MEG_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_SR_AND_JR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_SR_AND_JR, + .trainerName = _("ANNA & MEG"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 } + }, + + [TRAINER_ANNA_AND_MEG_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_SR_AND_JR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_SR_AND_JR, + .trainerName = _("ANNA & MEG"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 } + }, + + [TRAINER_ANNA_AND_MEG_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_SR_AND_JR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_SR_AND_JR, + .trainerName = _("ANNA & MEG"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 } + }, + + [TRAINER_VICTOR] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_WINSTRATE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerName = _("VICTOR"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemDefaultMoves = gTrainerParty_Victor } + }, + + [TRAINER_MIGUEL_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerName = _("MIGUEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 } + }, + + [TRAINER_COLTON] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerName = _("COLTON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Colton } + }, + + [TRAINER_MIGUEL_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerName = _("MIGUEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 } + }, + + [TRAINER_MIGUEL_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerName = _("MIGUEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 } + }, + + [TRAINER_MIGUEL_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerName = _("MIGUEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 } + }, + + [TRAINER_MIGUEL_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerName = _("MIGUEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 } + }, + + [TRAINER_VICTORIA] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_WINSTRATE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerName = _("VICTORIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x3, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Victoria } + }, + + [TRAINER_VANESSA] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerName = _("VANESSA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.ItemDefaultMoves = gTrainerParty_Vanessa } + }, + + [TRAINER_BETHANY] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerName = _("BETHANY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.ItemDefaultMoves = gTrainerParty_Bethany } + }, + + [TRAINER_ISABEL_1] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerName = _("ISABEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 } + }, + + [TRAINER_ISABEL_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerName = _("ISABEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 } + }, + + [TRAINER_ISABEL_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerName = _("ISABEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 } + }, + + [TRAINER_ISABEL_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerName = _("ISABEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 } + }, + + [TRAINER_ISABEL_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerName = _("ISABEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 } + }, + + [TRAINER_TIMOTHY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_M, + .trainerName = _("TIMOTHY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 } + }, + + [TRAINER_TIMOTHY_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_M, + .trainerName = _("TIMOTHY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 } + }, + + [TRAINER_TIMOTHY_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_M, + .trainerName = _("TIMOTHY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 } + }, + + [TRAINER_TIMOTHY_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_M, + .trainerName = _("TIMOTHY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 } + }, + + [TRAINER_TIMOTHY_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_M, + .trainerName = _("TIMOTHY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 } + }, + + [TRAINER_VICKY] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_WINSTRATE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_F, + .trainerName = _("VICKY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Vicky } + }, + + [TRAINER_SHELBY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_F, + .trainerName = _("SHELBY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 } + }, + + [TRAINER_SHELBY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_F, + .trainerName = _("SHELBY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 } + }, + + [TRAINER_SHELBY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_F, + .trainerName = _("SHELBY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 } + }, + + [TRAINER_SHELBY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_F, + .trainerName = _("SHELBY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 } + }, + + [TRAINER_SHELBY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_F, + .trainerName = _("SHELBY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 } + }, + + [TRAINER_CALVIN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("CALVIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 } + }, + + [TRAINER_BILLY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("BILLY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Billy } + }, + + [TRAINER_JOSH] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("JOSH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Josh } + }, + + [TRAINER_TOMMY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("TOMMY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Tommy } + }, + + [TRAINER_JOEY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("JOEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Joey } + }, + + [TRAINER_BEN] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("BEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Ben } + }, + + [TRAINER_QUINCY] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("QUINCY"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Quincy } + }, + + [TRAINER_KATELYNN] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("KATELYNN"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Katelynn } + }, + + [TRAINER_JAYLEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("JAYLEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jaylen } + }, + + [TRAINER_DILLON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("DILLON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Dillon } + }, + + [TRAINER_CALVIN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("CALVIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 } + }, + + [TRAINER_CALVIN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("CALVIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 } + }, + + [TRAINER_CALVIN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("CALVIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 } + }, + + [TRAINER_CALVIN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("CALVIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 } + }, + + [TRAINER_EDDIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("EDDIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Eddie } + }, + + [TRAINER_ALLEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("ALLEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Allen } + }, + + [TRAINER_TIMMY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("TIMMY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Timmy } + }, + + [TRAINER_WALLACE] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_CHAMPION, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CHAMPION_WALLACE, + .trainerName = _("WALLACE"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Wallace } + }, + + [TRAINER_ANDREW] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("ANDREW"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Andrew } + }, + + [TRAINER_IVAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("IVAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Ivan } + }, + + [TRAINER_CLAUDE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("CLAUDE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Claude } + }, + + [TRAINER_ELLIOT_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("ELLIOT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 } + }, + + [TRAINER_NED] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("NED"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Ned } + }, + + [TRAINER_DALE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("DALE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Dale } + }, + + [TRAINER_NOLAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("NOLAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Nolan } + }, + + [TRAINER_BARNY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("BARNY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Barny } + }, + + [TRAINER_WADE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("WADE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Wade } + }, + + [TRAINER_CARTER] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("CARTER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Carter } + }, + + [TRAINER_ELLIOT_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("ELLIOT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 } + }, + + [TRAINER_ELLIOT_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("ELLIOT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 } + }, + + [TRAINER_ELLIOT_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("ELLIOT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 } + }, + + [TRAINER_ELLIOT_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("ELLIOT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x3, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 } + }, + + [TRAINER_RONALD] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("RONALD"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Ronald } + }, + + [TRAINER_JACOB] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, + .trainerName = _("JACOB"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jacob } + }, + + [TRAINER_ANTHONY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, + .trainerName = _("ANTHONY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Anthony } + }, + + [TRAINER_BENJAMIN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, + .trainerName = _("BENJAMIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 } + }, + + [TRAINER_BENJAMIN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, + .trainerName = _("BENJAMIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 } + }, + + [TRAINER_BENJAMIN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, + .trainerName = _("BENJAMIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 } + }, + + [TRAINER_BENJAMIN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, + .trainerName = _("BENJAMIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 } + }, + + [TRAINER_BENJAMIN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, + .trainerName = _("BENJAMIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 } + }, + + [TRAINER_ABIGAIL_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, + .trainerName = _("ABIGAIL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 } + }, + + [TRAINER_JASMINE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, + .trainerName = _("JASMINE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine } + }, + + [TRAINER_ABIGAIL_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, + .trainerName = _("ABIGAIL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 } + }, + + [TRAINER_ABIGAIL_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, + .trainerName = _("ABIGAIL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 } + }, + + [TRAINER_ABIGAIL_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, + .trainerName = _("ABIGAIL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 } + }, + + [TRAINER_ABIGAIL_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, + .trainerName = _("ABIGAIL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 } + }, + + [TRAINER_DYLAN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, + .trainerName = _("DYLAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 } + }, + + [TRAINER_DYLAN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, + .trainerName = _("DYLAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 } + }, + + [TRAINER_DYLAN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, + .trainerName = _("DYLAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 } + }, + + [TRAINER_DYLAN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, + .trainerName = _("DYLAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 } + }, + + [TRAINER_DYLAN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M, + .trainerName = _("DYLAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 } + }, + + [TRAINER_MARIA_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, + .trainerName = _("MARIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 } + }, + + [TRAINER_MARIA_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, + .trainerName = _("MARIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 } + }, + + [TRAINER_MARIA_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, + .trainerName = _("MARIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 } + }, + + [TRAINER_MARIA_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, + .trainerName = _("MARIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 } + }, + + [TRAINER_MARIA_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, + .trainerName = _("MARIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 } + }, + + [TRAINER_CAMDEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("CAMDEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Camden } + }, + + [TRAINER_DEMETRIUS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("DEMETRIUS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Demetrius } + }, + + [TRAINER_ISAIAH_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("ISAIAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 } + }, + + [TRAINER_PABLO_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("PABLO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Pablo1 } + }, + + [TRAINER_CHASE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("CHASE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Chase } + }, + + [TRAINER_ISAIAH_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("ISAIAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 } + }, + + [TRAINER_ISAIAH_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("ISAIAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 } + }, + + [TRAINER_ISAIAH_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("ISAIAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 } + }, + + [TRAINER_ISAIAH_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("ISAIAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 } + }, + + [TRAINER_ISOBEL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("ISOBEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Isobel } + }, + + [TRAINER_DONNY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("DONNY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Donny } + }, + + [TRAINER_TALIA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("TALIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Talia } + }, + + [TRAINER_KATELYN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("KATELYN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 } + }, + + [TRAINER_ALLISON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("ALLISON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Allison } + }, + + [TRAINER_KATELYN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("KATELYN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 } + }, + + [TRAINER_KATELYN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("KATELYN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 } + }, + + [TRAINER_KATELYN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("KATELYN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 } + }, + + [TRAINER_KATELYN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("KATELYN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 } + }, + + [TRAINER_NICOLAS_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_DRAGON_TAMER, + .trainerName = _("NICOLAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 } + }, + + [TRAINER_NICOLAS_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_DRAGON_TAMER, + .trainerName = _("NICOLAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 } + }, + + [TRAINER_NICOLAS_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_DRAGON_TAMER, + .trainerName = _("NICOLAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 } + }, + + [TRAINER_NICOLAS_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_DRAGON_TAMER, + .trainerName = _("NICOLAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 } + }, + + [TRAINER_NICOLAS_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_DRAGON_TAMER, + .trainerName = _("NICOLAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 } + }, + + [TRAINER_AARON] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_DRAGON_TAMER, + .trainerName = _("AARON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Aaron } + }, + + [TRAINER_PERRY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("PERRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Perry } + }, + + [TRAINER_HUGH] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("HUGH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Hugh } + }, + + [TRAINER_PHIL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("PHIL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Phil } + }, + + [TRAINER_JARED] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("JARED"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jared } + }, + + [TRAINER_HUMBERTO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("HUMBERTO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Humberto } + }, + + [TRAINER_PRESLEY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("PRESLEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Presley } + }, + + [TRAINER_EDWARDO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("EDWARDO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Edwardo } + }, + + [TRAINER_COLIN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("COLIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Colin } + }, + + [TRAINER_ROBERT_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("ROBERT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 } + }, + + [TRAINER_BENNY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("BENNY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Benny } + }, + + [TRAINER_CHESTER] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("CHESTER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Chester } + }, + + [TRAINER_ROBERT_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("ROBERT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 } + }, + + [TRAINER_ROBERT_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("ROBERT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 } + }, + + [TRAINER_ROBERT_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("ROBERT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 } + }, + + [TRAINER_ROBERT_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("ROBERT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 } + }, + + [TRAINER_ALEX] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("ALEX"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Alex } + }, + + [TRAINER_BECK] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("BECK"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Beck } + }, + + [TRAINER_YASU] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("YASU"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x3, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Yasu } + }, + + [TRAINER_TAKASHI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("TAKASHI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x3, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Takashi } + }, + + [TRAINER_DIANNE] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("DIANNE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 2, + .party = {.ItemCustomMoves = gTrainerParty_Dianne } + }, + + [TRAINER_JANI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_F, + .trainerName = _("JANI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jani } + }, + + [TRAINER_LAO_1] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("LAO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 3, + .party = {.NoItemCustomMoves = gTrainerParty_Lao1 } + }, + + [TRAINER_LUNG] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("LUNG"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Lung } + }, + + [TRAINER_LAO_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("LAO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 4, + .party = {.NoItemCustomMoves = gTrainerParty_Lao2 } + }, + + [TRAINER_LAO_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("LAO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 4, + .party = {.NoItemCustomMoves = gTrainerParty_Lao3 } + }, + + [TRAINER_LAO_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("LAO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 4, + .party = {.NoItemCustomMoves = gTrainerParty_Lao4 } + }, + + [TRAINER_LAO_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("LAO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Lao5 } + }, + + [TRAINER_JOCELYN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("JOCELYN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jocelyn } + }, + + [TRAINER_LAURA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("LAURA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Laura } + }, + + [TRAINER_CYNDY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("CYNDY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 } + }, + + [TRAINER_CORA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("CORA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Cora } + }, + + [TRAINER_PAULA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("PAULA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Paula } + }, + + [TRAINER_CYNDY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("CYNDY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 } + }, + + [TRAINER_CYNDY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("CYNDY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 } + }, + + [TRAINER_CYNDY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("CYNDY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 } + }, + + [TRAINER_CYNDY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("CYNDY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 } + }, + + [TRAINER_MADELINE_1] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_PARASOL_LADY, + .trainerName = _("MADELINE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 } + }, + + [TRAINER_CLARISSA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_PARASOL_LADY, + .trainerName = _("CLARISSA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa } + }, + + [TRAINER_ANGELICA] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_PARASOL_LADY, + .trainerName = _("ANGELICA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Angelica } + }, + + [TRAINER_MADELINE_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_PARASOL_LADY, + .trainerName = _("MADELINE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 } + }, + + [TRAINER_MADELINE_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_PARASOL_LADY, + .trainerName = _("MADELINE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 } + }, + + [TRAINER_MADELINE_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_PARASOL_LADY, + .trainerName = _("MADELINE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 } + }, + + [TRAINER_MADELINE_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_PARASOL_LADY, + .trainerName = _("MADELINE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 } + }, + + [TRAINER_BEVERLY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("BEVERLY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Beverly } + }, + + [TRAINER_IMANI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("IMANI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Imani } + }, + + [TRAINER_KYLA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("KYLA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Kyla } + }, + + [TRAINER_DENISE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("DENISE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Denise } + }, + + [TRAINER_BETH] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("BETH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Beth } + }, + + [TRAINER_TARA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("TARA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Tara } + }, + + [TRAINER_MISSY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("MISSY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Missy } + }, + + [TRAINER_ALICE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("ALICE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Alice } + }, + + [TRAINER_JENNY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("JENNY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 } + }, + + [TRAINER_GRACE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("GRACE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grace } + }, + + [TRAINER_TANYA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("TANYA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Tanya } + }, + + [TRAINER_SHARON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("SHARON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Sharon } + }, + + [TRAINER_NIKKI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("NIKKI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Nikki } + }, + + [TRAINER_BRENDA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("BRENDA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Brenda } + }, + + [TRAINER_KATIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("KATIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Katie } + }, + + [TRAINER_SUSIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("SUSIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Susie } + }, + + [TRAINER_KARA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("KARA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Kara } + }, + + [TRAINER_DANA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("DANA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Dana } + }, + + [TRAINER_SIENNA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("SIENNA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Sienna } + }, + + [TRAINER_DEBRA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("DEBRA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Debra } + }, + + [TRAINER_LINDA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("LINDA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Linda } + }, + + [TRAINER_KAYLEE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("KAYLEE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee } + }, + + [TRAINER_LAUREL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("LAUREL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Laurel } + }, + + [TRAINER_CARLEE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("CARLEE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Carlee } + }, + + [TRAINER_JENNY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("JENNY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 } + }, + + [TRAINER_JENNY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("JENNY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 } + }, + + [TRAINER_JENNY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("JENNY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 } + }, + + [TRAINER_JENNY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("JENNY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 } + }, + + [TRAINER_HEIDI] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("HEIDI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Heidi } + }, + + [TRAINER_BECKY] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("BECKY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Becky } + }, + + [TRAINER_CAROL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("CAROL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Carol } + }, + + [TRAINER_NANCY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("NANCY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Nancy } + }, + + [TRAINER_MARTHA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("MARTHA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Martha } + }, + + [TRAINER_DIANA_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("DIANA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 } + }, + + [TRAINER_CEDRIC] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("CEDRIC"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Cedric } + }, + + [TRAINER_IRENE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("IRENE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Irene } + }, + + [TRAINER_DIANA_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("DIANA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 } + }, + + [TRAINER_DIANA_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("DIANA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 } + }, + + [TRAINER_DIANA_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("DIANA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 } + }, + + [TRAINER_DIANA_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("DIANA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 } + }, + + [TRAINER_AMY_AND_LIV_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("AMY & LIV"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 } + }, + + [TRAINER_AMY_AND_LIV_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("AMY & LIV"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 } + }, + + [TRAINER_GINA_AND_MIA_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("GINA & MIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 } + }, + + [TRAINER_MIU_AND_YUKI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("MIU & YUKI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki } + }, + + [TRAINER_AMY_AND_LIV_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("AMY & LIV"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 } + }, + + [TRAINER_GINA_AND_MIA_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("GINA & MIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 } + }, + + [TRAINER_AMY_AND_LIV_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("AMY & LIV"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 } + }, + + [TRAINER_AMY_AND_LIV_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("AMY & LIV"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 } + }, + + [TRAINER_AMY_AND_LIV_6] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("AMY & LIV"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 } + }, + + [TRAINER_HUEY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("HUEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Huey } + }, + + [TRAINER_EDMOND] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("EDMOND"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Edmond } + }, + + [TRAINER_ERNEST_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("ERNEST"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 } + }, + + [TRAINER_DWAYNE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("DWAYNE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne } + }, + + [TRAINER_PHILLIP] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("PHILLIP"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Phillip } + }, + + [TRAINER_LEONARD] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("LEONARD"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Leonard } + }, + + [TRAINER_DUNCAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("DUNCAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Duncan } + }, + + [TRAINER_ERNEST_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("ERNEST"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 } + }, + + [TRAINER_ERNEST_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("ERNEST"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 } + }, + + [TRAINER_ERNEST_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("ERNEST"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 } + }, + + [TRAINER_ERNEST_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("ERNEST"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 } + }, + + [TRAINER_ELI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("ELI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Eli } + }, + + [TRAINER_ANNIKA] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerName = _("ANNIKA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemCustomMoves = gTrainerParty_Annika } + }, + + [TRAINER_JAZMYN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_2, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("JAZMYN"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jazmyn } + }, + + [TRAINER_JONAS] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("JONAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Jonas } + }, + + [TRAINER_KAYLEY] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_PARASOL_LADY, + .trainerName = _("KAYLEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Kayley } + }, + + [TRAINER_AURON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_M, + .trainerName = _("AURON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Auron } + }, + + [TRAINER_KELVIN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("KELVIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin } + }, + + [TRAINER_MARLEY] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("MARLEY"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.ItemCustomMoves = gTrainerParty_Marley } + }, + + [TRAINER_REYNA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("REYNA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Reyna } + }, + + [TRAINER_HUDSON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("HUDSON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Hudson } + }, + + [TRAINER_CONOR] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_M, + .trainerName = _("CONOR"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Conor } + }, + + [TRAINER_EDWIN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COLLECTOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_COLLECTOR, + .trainerName = _("EDWIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 } + }, + + [TRAINER_HECTOR] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COLLECTOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_COLLECTOR, + .trainerName = _("HECTOR"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Hector } + }, + + [TRAINER_TABITHA_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_ADMIN, + .trainerName = _("TABITHA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 } + }, + + [TRAINER_EDWIN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COLLECTOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_COLLECTOR, + .trainerName = _("EDWIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 } + }, + + [TRAINER_EDWIN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COLLECTOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_COLLECTOR, + .trainerName = _("EDWIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 } + }, + + [TRAINER_EDWIN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COLLECTOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_COLLECTOR, + .trainerName = _("EDWIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 } + }, + + [TRAINER_EDWIN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COLLECTOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_COLLECTOR, + .trainerName = _("EDWIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 } + }, + + [TRAINER_WALLY_1] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_WALLY, + .trainerName = _("WALLY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.NoItemCustomMoves = gTrainerParty_Wally1 } + }, + + [TRAINER_BRENDAN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 } + }, + + [TRAINER_BRENDAN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 } + }, + + [TRAINER_BRENDAN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 } + }, + + [TRAINER_BRENDAN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 } + }, + + [TRAINER_BRENDAN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 } + }, + + [TRAINER_BRENDAN_6] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 } + }, + + [TRAINER_BRENDAN_7] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 } + }, + + [TRAINER_BRENDAN_8] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 } + }, + + [TRAINER_BRENDAN_9] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 } + }, + + [TRAINER_MAY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_May1 } + }, + + [TRAINER_MAY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_May2 } + }, + + [TRAINER_MAY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_May3 } + }, + + [TRAINER_MAY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_May4 } + }, + + [TRAINER_MAY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_May5 } + }, + + [TRAINER_MAY_6] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_May6 } + }, + + [TRAINER_MAY_7] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_May7 } + }, + + [TRAINER_MAY_8] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_May8 } + }, + + [TRAINER_MAY_9] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_May9 } + }, + + [TRAINER_ISAAC_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, + .trainerName = _("ISAAC"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 } + }, + + [TRAINER_DAVIS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("DAVIS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Davis } + }, + + [TRAINER_MITCHELL] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("MITCHELL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Mitchell } + }, + + [TRAINER_ISAAC_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, + .trainerName = _("ISAAC"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 } + }, + + [TRAINER_ISAAC_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, + .trainerName = _("ISAAC"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 } + }, + + [TRAINER_ISAAC_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, + .trainerName = _("ISAAC"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 } + }, + + [TRAINER_ISAAC_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, + .trainerName = _("ISAAC"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 } + }, + + [TRAINER_LYDIA_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("LYDIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 } + }, + + [TRAINER_HALLE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("HALLE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Halle } + }, + + [TRAINER_GARRISON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("GARRISON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Garrison } + }, + + [TRAINER_LYDIA_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("LYDIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 } + }, + + [TRAINER_LYDIA_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("LYDIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 } + }, + + [TRAINER_LYDIA_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("LYDIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 } + }, + + [TRAINER_LYDIA_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("LYDIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 } + }, + + [TRAINER_JACKSON_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, + .trainerName = _("JACKSON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 } + }, + + [TRAINER_LORENZO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, + .trainerName = _("LORENZO"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Lorenzo } + }, + + [TRAINER_SEBASTIAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, + .trainerName = _("SEBASTIAN"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian } + }, + + [TRAINER_JACKSON_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, + .trainerName = _("JACKSON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 } + }, + + [TRAINER_JACKSON_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, + .trainerName = _("JACKSON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 } + }, + + [TRAINER_JACKSON_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, + .trainerName = _("JACKSON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 } + }, + + [TRAINER_JACKSON_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_M, + .trainerName = _("JACKSON"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 } + }, + + [TRAINER_CATHERINE_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, + .trainerName = _("CATHERINE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 } + }, + + [TRAINER_JENNA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, + .trainerName = _("JENNA"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jenna } + }, + + [TRAINER_SOPHIA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, + .trainerName = _("SOPHIA"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Sophia } + }, + + [TRAINER_CATHERINE_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, + .trainerName = _("CATHERINE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 } + }, + + [TRAINER_CATHERINE_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, + .trainerName = _("CATHERINE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 } + }, + + [TRAINER_CATHERINE_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, + .trainerName = _("CATHERINE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 } + }, + + [TRAINER_CATHERINE_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_RANGER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_POKEMON_RANGER_F, + .trainerName = _("CATHERINE"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 } + }, + + [TRAINER_JULIO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M, + .trainerName = _("JULIO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Julio } + }, + + [TRAINER_GRUNT_27] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 } + }, + + [TRAINER_GRUNT_28] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 } + }, + + [TRAINER_GRUNT_29] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 } + }, + + [TRAINER_GRUNT_30] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 } + }, + + [TRAINER_MARC] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("MARC"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Marc } + }, + + [TRAINER_BRENDEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("BRENDEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Brenden } + }, + + [TRAINER_LILITH] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("LILITH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Lilith } + }, + + [TRAINER_CRISTIAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("CRISTIAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Cristian } + }, + + [TRAINER_SYLVIA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("SYLVIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Sylvia } + }, + + [TRAINER_LEONARDO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("LEONARDO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Leonardo } + }, + + [TRAINER_ATHENA] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("ATHENA"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.ItemCustomMoves = gTrainerParty_Athena } + }, + + [TRAINER_HARRISON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("HARRISON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Harrison } + }, + + [TRAINER_GRUNT_31] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 } + }, + + [TRAINER_CLARENCE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("CLARENCE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Clarence } + }, + + [TRAINER_TERRY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("TERRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Terry } + }, + + [TRAINER_NATE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("NATE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Nate } + }, + + [TRAINER_KATHLEEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_HEX_MANIAC, + .trainerName = _("KATHLEEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Kathleen } + }, + + [TRAINER_CLIFFORD] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("CLIFFORD"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Clifford } + }, + + [TRAINER_NICHOLAS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("NICHOLAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Nicholas } + }, + + [TRAINER_GRUNT_32] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 } + }, + + [TRAINER_GRUNT_33] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 } + }, + + [TRAINER_GRUNT_34] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 } + }, + + [TRAINER_GRUNT_35] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 } + }, + + [TRAINER_GRUNT_36] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 } + }, + + [TRAINER_MACEY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("MACEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Macey } + }, + + [TRAINER_BRENDAN_10] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 } + }, + + [TRAINER_BRENDAN_11] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 } + }, + + [TRAINER_PAXTON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_M, + .trainerName = _("PAXTON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Paxton } + }, + + [TRAINER_ISABELLA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + .trainerName = _("ISABELLA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Isabella } + }, + + [TRAINER_GRUNT_37] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_AQUA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA, + .trainerPic = TRAINER_PIC_AQUA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 } + }, + + [TRAINER_TABITHA_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_ADMIN, + .trainerName = _("TABITHA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 } + }, + + [TRAINER_JONATHAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("JONATHAN"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jonathan } + }, + + [TRAINER_BRENDAN_12] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 } + }, + + [TRAINER_MAY_10] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0xb, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_May10 } + }, + + [TRAINER_MAXIE_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_MAGMA_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE, + .trainerName = _("MAXIE"), + .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 } + }, + + [TRAINER_MAXIE_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_MAGMA_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE, + .trainerName = _("MAXIE"), + .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 } + }, + + [TRAINER_TIANA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("TIANA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Tiana } + }, + + [TRAINER_HALEY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("HALEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 } + }, + + [TRAINER_JANICE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("JANICE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Janice } + }, + + [TRAINER_VIVI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_WINSTRATE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("VIVI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Vivi } + }, + + [TRAINER_HALEY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("HALEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 } + }, + + [TRAINER_HALEY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("HALEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 } + }, + + [TRAINER_HALEY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("HALEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 } + }, + + [TRAINER_HALEY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("HALEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 } + }, + + [TRAINER_SALLY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("SALLY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Sally } + }, + + [TRAINER_ROBIN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("ROBIN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Robin } + }, + + [TRAINER_ANDREA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("ANDREA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Andrea } + }, + + [TRAINER_CRISSY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_LASS, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LASS, + .trainerName = _("CRISSY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Crissy } + }, + + [TRAINER_RICK] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("RICK"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Rick } + }, + + [TRAINER_LYLE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("LYLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Lyle } + }, + + [TRAINER_JOSE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("JOSE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jose } + }, + + [TRAINER_DOUG] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("DOUG"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Doug } + }, + + [TRAINER_GREG] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("GREG"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Greg } + }, + + [TRAINER_KENT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("KENT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Kent } + }, + + [TRAINER_JAMES_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("JAMES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_James1 } + }, + + [TRAINER_JAMES_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("JAMES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_James2 } + }, + + [TRAINER_JAMES_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("JAMES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_James3 } + }, + + [TRAINER_JAMES_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("JAMES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_James4 } + }, + + [TRAINER_JAMES_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BUG_CATCHER, + .trainerName = _("JAMES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_James5 } + }, + + [TRAINER_BRICE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("BRICE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Brice } + }, + + [TRAINER_TRENT_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("TRENT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 } + }, + + [TRAINER_LENNY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("LENNY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Lenny } + }, + + [TRAINER_LUCAS_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("LUCAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 } + }, + + [TRAINER_ALAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("ALAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Alan } + }, + + [TRAINER_CLARK] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("CLARK"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Clark } + }, + + [TRAINER_ERIC] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("ERIC"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Eric } + }, + + [TRAINER_LUCAS_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("LUCAS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 } + }, + + [TRAINER_MIKE_1] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("MIKE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Mike1 } + }, + + [TRAINER_MIKE_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("MIKE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 } + }, + + [TRAINER_TRENT_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("TRENT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 } + }, + + [TRAINER_TRENT_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("TRENT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 } + }, + + [TRAINER_TRENT_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("TRENT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 } + }, + + [TRAINER_TRENT_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("TRENT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 } + }, + + [TRAINER_DEZ_AND_LUKE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, + .trainerName = _("DEZ & LUKE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke } + }, + + [TRAINER_LEA_AND_JED] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, + .trainerName = _("LEA & JED"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed } + }, + + [TRAINER_KIRA_AND_DAN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, + .trainerName = _("KIRA & DAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan1 } + }, + + [TRAINER_KIRA_AND_DAN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, + .trainerName = _("KIRA & DAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan2 } + }, + + [TRAINER_KIRA_AND_DAN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, + .trainerName = _("KIRA & DAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan3 } + }, + + [TRAINER_KIRA_AND_DAN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, + .trainerName = _("KIRA & DAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan4 } + }, + + [TRAINER_KIRA_AND_DAN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, + .trainerName = _("KIRA & DAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_KiraAndDan5 } + }, + + [TRAINER_JOHANNA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("JOHANNA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Johanna } + }, + + [TRAINER_GERALD] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("GERALD"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Gerald } + }, + + [TRAINER_VIVIAN] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("VIVIAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Vivian } + }, + + [TRAINER_DANIELLE] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("DANIELLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Danielle } + }, + + [TRAINER_HIDEO] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("HIDEO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x3, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Hideo } + }, + + [TRAINER_KEIGO] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("KEIGO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x3, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Keigo } + }, + + [TRAINER_RILEY] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("RILEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x3, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_Riley } + }, + + [TRAINER_FLINT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("FLINT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Flint } + }, + + [TRAINER_ASHLEY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("ASHLEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Ashley } + }, + + [TRAINER_WALLY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_WALLY, + .trainerName = _("WALLY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 } + }, + + [TRAINER_WALLY_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_WALLY, + .trainerName = _("WALLY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.NoItemCustomMoves = gTrainerParty_Wally3 } + }, + + [TRAINER_WALLY_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_WALLY, + .trainerName = _("WALLY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.NoItemCustomMoves = gTrainerParty_Wally4 } + }, + + [TRAINER_WALLY_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_WALLY, + .trainerName = _("WALLY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.NoItemCustomMoves = gTrainerParty_Wally5 } + }, + + [TRAINER_WALLY_6] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_WALLY, + .trainerName = _("WALLY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.NoItemCustomMoves = gTrainerParty_Wally6 } + }, + + [TRAINER_BRENDAN_13] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan13 } + }, + + [TRAINER_BRENDAN_14] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan14 } + }, + + [TRAINER_BRENDAN_15] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan15 } + }, + + [TRAINER_MAY_11] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_May11 } + }, + + [TRAINER_MAY_12] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_May12 } + }, + + [TRAINER_MAY_13] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_May13 } + }, + + [TRAINER_JONAH] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("JONAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Jonah } + }, + + [TRAINER_HENRY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("HENRY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Henry } + }, + + [TRAINER_ROGER] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("ROGER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Roger } + }, + + [TRAINER_ALEXA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("ALEXA"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Alexa } + }, + + [TRAINER_RUBEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("RUBEN"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Ruben } + }, + + [TRAINER_KOJI_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("KOJI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Koji1 } + }, + + [TRAINER_WAYNE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("WAYNE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Wayne } + }, + + [TRAINER_AIDAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("AIDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Aidan } + }, + + [TRAINER_REED] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("REED"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Reed } + }, + + [TRAINER_TISHA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("TISHA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Tisha } + }, + + [TRAINER_TORI_AND_TIA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TWINS, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_TWINS, + .trainerName = _("TORI & TIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia } + }, + + [TRAINER_KIM_AND_IRIS] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_SR_AND_JR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_SR_AND_JR, + .trainerName = _("KIM & IRIS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris } + }, + + [TRAINER_TYRA_AND_IVY] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_SR_AND_JR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_SR_AND_JR, + .trainerName = _("TYRA & IVY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy } + }, + + [TRAINER_MEL_AND_PAUL] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_YOUNG_COUPLE, + .trainerName = _("MEL & PAUL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul } + }, + + [TRAINER_JOHN_AND_JAY_1] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_OLD_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_OLD_COUPLE, + .trainerName = _("JOHN & JAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 } + }, + + [TRAINER_JOHN_AND_JAY_2] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_OLD_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_OLD_COUPLE, + .trainerName = _("JOHN & JAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 } + }, + + [TRAINER_JOHN_AND_JAY_3] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_OLD_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_OLD_COUPLE, + .trainerName = _("JOHN & JAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 } + }, + + [TRAINER_JOHN_AND_JAY_4] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_OLD_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_OLD_COUPLE, + .trainerName = _("JOHN & JAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0xb, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 } + }, + + [TRAINER_JOHN_AND_JAY_5] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_OLD_COUPLE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_OLD_COUPLE, + .trainerName = _("JOHN & JAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 } + }, + + [TRAINER_RELI_AND_IAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, + .trainerName = _("RELI & IAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan } + }, + + [TRAINER_LILA_AND_ROY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, + .trainerName = _("LILA & ROY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy1 } + }, + + [TRAINER_LILA_AND_ROY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, + .trainerName = _("LILA & ROY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy2 } + }, + + [TRAINER_LILA_AND_ROY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, + .trainerName = _("LILA & ROY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy3 } + }, + + [TRAINER_LILA_AND_ROY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, + .trainerName = _("LILA & ROY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy4 } + }, + + [TRAINER_LILA_AND_ROY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, + .trainerName = _("LILA & ROY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_LilaAndRoy5 } + }, + + [TRAINER_LISA_AND_RAY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SIS_AND_BRO, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SIS_AND_BRO, + .trainerName = _("LISA & RAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay } + }, + + [TRAINER_CHRIS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("CHRIS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Chris } + }, + + [TRAINER_DAWSON] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_RICH_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_RICH_BOY, + .trainerName = _("DAWSON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemDefaultMoves = gTrainerParty_Dawson } + }, + + [TRAINER_SARAH] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LADY, + .trainerName = _("SARAH"), + .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemDefaultMoves = gTrainerParty_Sarah } + }, + + [TRAINER_DARIAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("DARIAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Darian } + }, + + [TRAINER_HAILEY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_F, + .trainerName = _("HAILEY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Hailey } + }, + + [TRAINER_CHANDLER] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TUBER_2, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_TUBER_M, + .trainerName = _("CHANDLER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Chandler } + }, + + [TRAINER_KALEB] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM, + .trainerClass = TRAINER_CLASS_POKEFAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, + .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerName = _("KALEB"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.ItemDefaultMoves = gTrainerParty_Kaleb } + }, + + [TRAINER_JOSEPH] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("JOSEPH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Joseph } + }, + + [TRAINER_ALYSSA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F, + .trainerName = _("ALYSSA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Alyssa } + }, + + [TRAINER_MARCOS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("MARCOS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Marcos } + }, + + [TRAINER_RHETT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("RHETT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Rhett } + }, + + [TRAINER_TYRON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("TYRON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Tyron } + }, + + [TRAINER_CELINA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AROMA_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerName = _("CELINA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Celina } + }, + + [TRAINER_BIANCA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("BIANCA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Bianca } + }, + + [TRAINER_HAYDEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("HAYDEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Hayden } + }, + + [TRAINER_SOPHIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("SOPHIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Sophie } + }, + + [TRAINER_COBY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("COBY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Coby } + }, + + [TRAINER_LAWRENCE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("LAWRENCE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Lawrence } + }, + + [TRAINER_WYATT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_POKEMANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_POKEMANIAC, + .trainerName = _("WYATT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Wyatt } + }, + + [TRAINER_ANGELINA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("ANGELINA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Angelina } + }, + + [TRAINER_KAI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FISHERMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_FISHERMAN, + .trainerName = _("KAI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Kai } + }, + + [TRAINER_CHARLOTTE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("CHARLOTTE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Charlotte } + }, + + [TRAINER_DEANDRE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("DEANDRE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Deandre } + }, + + [TRAINER_GRUNT_38] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 } + }, + + [TRAINER_GRUNT_39] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 } + }, + + [TRAINER_GRUNT_40] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 } + }, + + [TRAINER_GRUNT_41] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 } + }, + + [TRAINER_GRUNT_42] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 } + }, + + [TRAINER_GRUNT_43] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 } + }, + + [TRAINER_GRUNT_44] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 } + }, + + [TRAINER_GRUNT_45] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 } + }, + + [TRAINER_GRUNT_46] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 } + }, + + [TRAINER_GRUNT_47] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 } + }, + + [TRAINER_GRUNT_48] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 } + }, + + [TRAINER_GRUNT_49] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 } + }, + + [TRAINER_GRUNT_50] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 } + }, + + [TRAINER_GRUNT_51] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 } + }, + + [TRAINER_GRUNT_52] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 } + }, + + [TRAINER_GRUNT_53] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TEAM_MAGMA, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F, + .trainerName = _("GRUNT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 } + }, + + [TRAINER_TABITHA_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_ADMIN, + .trainerName = _("TABITHA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 4, + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha3 } + }, + + [TRAINER_DARCY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("DARCY"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Darcy } + }, + + [TRAINER_MAXIE_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_MAGMA_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA, + .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE, + .trainerName = _("MAXIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 } + }, + + [TRAINER_PETE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_M, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_M, + .trainerName = _("PETE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Pete } + }, + + [TRAINER_ISABELLE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SWIMMER_F, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMER_F, + .trainerName = _("ISABELLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Isabelle } + }, + + [TRAINER_ANDRES_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("ANDRES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Andres1 } + }, + + [TRAINER_JOSUE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("JOSUE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Josue } + }, + + [TRAINER_CAMRON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("CAMRON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Camron } + }, + + [TRAINER_CORY_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("CORY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Cory1 } + }, + + [TRAINER_CAROLINA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("CAROLINA"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Carolina } + }, + + [TRAINER_ELIJAH] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("ELIJAH"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Elijah } + }, + + [TRAINER_CELIA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PICNICKER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, + .trainerPic = TRAINER_PIC_PICNICKER, + .trainerName = _("CELIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Celia } + }, + + [TRAINER_BRYAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("BRYAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Bryan } + }, + + [TRAINER_BRANDEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_CAMPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_CAMPER, + .trainerName = _("BRANDEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Branden } + }, + + [TRAINER_BRYANT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("BRYANT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Bryant } + }, + + [TRAINER_SHAYLA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_AROMA_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_AROMA_LADY, + .trainerName = _("SHAYLA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Shayla } + }, + + [TRAINER_KYRA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, + .trainerName = _("KYRA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Kyra } + }, + + [TRAINER_JAIDEN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_NINJA_BOY, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_NINJA_BOY, + .trainerName = _("JAIDEN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Jaiden } + }, + + [TRAINER_ALIX] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("ALIX"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Alix } + }, + + [TRAINER_HELENE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("HELENE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Helene } + }, + + [TRAINER_MARLENE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("MARLENE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Marlene } + }, + + [TRAINER_DEVAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("DEVAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Devan } + }, + + [TRAINER_JOHNSON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_YOUNGSTER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_YOUNGSTER, + .trainerName = _("JOHNSON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Johnson } + }, + + [TRAINER_MELINA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F, + .trainerName = _("MELINA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Melina } + }, + + [TRAINER_BRANDI] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("BRANDI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Brandi } + }, + + [TRAINER_AISHA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("AISHA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Aisha } + }, + + [TRAINER_MAKAYLA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_EXPERT, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_EXPERT_F, + .trainerName = _("MAKAYLA"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Makayla } + }, + + [TRAINER_FABIAN] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("FABIAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Fabian } + }, + + [TRAINER_DAYTON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_KINDLER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_KINDLER, + .trainerName = _("DAYTON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Dayton } + }, + + [TRAINER_RACHEL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_PARASOL_LADY, + .trainerName = _("RACHEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Rachel } + }, + + [TRAINER_LEONEL] = + { + .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerName = _("LEONEL"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemCustomMoves = gTrainerParty_Leonel } + }, + + [TRAINER_CALLIE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BATTLE_GIRL, + .trainerName = _("CALLIE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Callie } + }, + + [TRAINER_CALE] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("CALE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cale } + }, + + [TRAINER_MYLES] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M, + .trainerName = _("MYLES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Myles } + }, + + [TRAINER_PAT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("PAT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Pat } + }, + + [TRAINER_CRISTIN_1] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("CRISTIN"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cristin1 } + }, + + [TRAINER_MAY_14] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_May14 } + }, + + [TRAINER_MAY_15] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_May15 } + }, + + [TRAINER_ROXANNE_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_ROXANNE, + .trainerName = _("ROXANNE"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Roxanne2 } + }, + + [TRAINER_ROXANNE_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_ROXANNE, + .trainerName = _("ROXANNE"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Roxanne3 } + }, + + [TRAINER_ROXANNE_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_ROXANNE, + .trainerName = _("ROXANNE"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Roxanne4 } + }, + + [TRAINER_ROXANNE_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_ROXANNE, + .trainerName = _("ROXANNE"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Roxanne5 } + }, + + [TRAINER_BRAWLY_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_BRAWLY, + .trainerName = _("BRAWLY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Brawly2 } + }, + + [TRAINER_BRAWLY_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_BRAWLY, + .trainerName = _("BRAWLY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Brawly3 } + }, + + [TRAINER_BRAWLY_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_BRAWLY, + .trainerName = _("BRAWLY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Brawly4 } + }, + + [TRAINER_BRAWLY_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_BRAWLY, + .trainerName = _("BRAWLY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Brawly5 } + }, + + [TRAINER_WATTSON_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_WATTSON, + .trainerName = _("WATTSON"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Wattson2 } + }, + + [TRAINER_WATTSON_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_WATTSON, + .trainerName = _("WATTSON"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Wattson3 } + }, + + [TRAINER_WATTSON_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_WATTSON, + .trainerName = _("WATTSON"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Wattson4 } + }, + + [TRAINER_WATTSON_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_WATTSON, + .trainerName = _("WATTSON"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Wattson5 } + }, + + [TRAINER_FLANNERY_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_FLANNERY, + .trainerName = _("FLANNERY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Flannery2 } + }, + + [TRAINER_FLANNERY_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_FLANNERY, + .trainerName = _("FLANNERY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Flannery3 } + }, + + [TRAINER_FLANNERY_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_FLANNERY, + .trainerName = _("FLANNERY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Flannery4 } + }, + + [TRAINER_FLANNERY_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_FLANNERY, + .trainerName = _("FLANNERY"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Flannery5 } + }, + + [TRAINER_NORMAN_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_NORMAN, + .trainerName = _("NORMAN"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 4, + .party = {.ItemCustomMoves = gTrainerParty_Norman2 } + }, + + [TRAINER_NORMAN_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_NORMAN, + .trainerName = _("NORMAN"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Norman3 } + }, + + [TRAINER_NORMAN_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_NORMAN, + .trainerName = _("NORMAN"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Norman4 } + }, + + [TRAINER_NORMAN_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_NORMAN, + .trainerName = _("NORMAN"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Norman5 } + }, + + [TRAINER_WINONA_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_WINONA, + .trainerName = _("WINONA"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x17, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Winona2 } + }, + + [TRAINER_WINONA_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_WINONA, + .trainerName = _("WINONA"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x17, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Winona3 } + }, + + [TRAINER_WINONA_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_WINONA, + .trainerName = _("WINONA"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x17, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Winona4 } + }, + + [TRAINER_WINONA_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_WINONA, + .trainerName = _("WINONA"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x17, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Winona5 } + }, + + [TRAINER_TATE_AND_LIZA_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, + .trainerName = _("TATE&LIZA"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza2 } + }, + + [TRAINER_TATE_AND_LIZA_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, + .trainerName = _("TATE&LIZA"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza3 } + }, + + [TRAINER_TATE_AND_LIZA_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, + .trainerName = _("TATE&LIZA"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza4 } + }, + + [TRAINER_TATE_AND_LIZA_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA, + .trainerName = _("TATE&LIZA"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza5 } + }, + + [TRAINER_JUAN_2] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_JUAN, + .trainerName = _("JUAN"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Juan2 } + }, + + [TRAINER_JUAN_3] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_JUAN, + .trainerName = _("JUAN"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 5, + .party = {.ItemCustomMoves = gTrainerParty_Juan3 } + }, + + [TRAINER_JUAN_4] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_JUAN, + .trainerName = _("JUAN"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Juan4 } + }, + + [TRAINER_JUAN_5] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_LEADER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEADER_JUAN, + .trainerName = _("JUAN"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE}, + .doubleBattle = TRUE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Juan5 } + }, + + [TRAINER_ANGELO] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS, + .trainerPic = TRAINER_PIC_BUG_MANIAC, + .trainerName = _("ANGELO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.ItemCustomMoves = gTrainerParty_Angelo } + }, + + [TRAINER_DARIUS] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_BIRD_KEEPER, + .trainerName = _("DARIUS"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Darius } + }, + + [TRAINER_STEVEN] = + { + .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_STEVEN, + .trainerName = _("STEVEN"), + .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 6, + .party = {.ItemCustomMoves = gTrainerParty_Steven } + }, + + [TRAINER_ANABEL] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SALON_MAIDEN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SALON_MAIDEN_ANABEL, + .trainerName = _("ANABEL"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Anabel } + }, + + [TRAINER_TUCKER] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_DOME_ACE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_DOME_ACE_TUCKER, + .trainerName = _("TUCKER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Tucker } + }, + + [TRAINER_SPENSER] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PALACE_MAVEN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_PALACE_MAVEN_SPENSER, + .trainerName = _("SPENSER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Spenser } + }, + + [TRAINER_GRETA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_ARENA_TYCOON, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_ARENA_TYCOON_GRETA, + .trainerName = _("GRETA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Greta } + }, + + [TRAINER_NOLAND] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_FACTORY_HEAD, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_FACTORY_HEAD_NOLAND, + .trainerName = _("NOLAND"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Noland } + }, + + [TRAINER_LUCY] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PIKE_QUEEN, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_PIKE_QUEEN_LUCY, + .trainerName = _("LUCY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Lucy } + }, + + [TRAINER_BRANDON] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PYRAMID_KING, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_PYRAMID_KING_BRANDON, + .trainerName = _("BRANDON"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon } + }, + + [TRAINER_ANDRES_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("ANDRES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Andres2 } + }, + + [TRAINER_ANDRES_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("ANDRES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Andres3 } + }, + + [TRAINER_ANDRES_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("ANDRES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Andres4 } + }, + + [TRAINER_ANDRES_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_RUIN_MANIAC, + .trainerName = _("ANDRES"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Andres5 } + }, + + [TRAINER_CORY_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("CORY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Cory2 } + }, + + [TRAINER_CORY_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("CORY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Cory3 } + }, + + [TRAINER_CORY_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("CORY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Cory4 } + }, + + [TRAINER_CORY_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_SAILOR, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_SAILOR, + .trainerName = _("CORY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Cory5 } + }, + + [TRAINER_PABLO_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("PABLO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Pablo2 } + }, + + [TRAINER_PABLO_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("PABLO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Pablo3 } + }, + + [TRAINER_PABLO_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("PABLO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Pablo4 } + }, + + [TRAINER_PABLO_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_TRIATHLETE, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER, + .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + .trainerName = _("PABLO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Pablo5 } + }, + + [TRAINER_KOJI_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("KOJI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Koji2 } + }, + + [TRAINER_KOJI_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("KOJI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Koji3 } + }, + + [TRAINER_KOJI_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("KOJI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Koji4 } + }, + + [TRAINER_KOJI_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BLACK_BELT, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_BLACK_BELT, + .trainerName = _("KOJI"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Koji5 } + }, + + [TRAINER_CRISTIN_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("CRISTIN"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Cristin2 } + }, + + [TRAINER_CRISTIN_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("CRISTIN"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Cristin3 } + }, + + [TRAINER_CRISTIN_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("CRISTIN"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Cristin4 } + }, + + [TRAINER_CRISTIN_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, + .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerName = _("CRISTIN"), + .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Cristin5 } + }, + + [TRAINER_FERNANDO_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("FERNANDO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Fernando2 } + }, + + [TRAINER_FERNANDO_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("FERNANDO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Fernando3 } + }, + + [TRAINER_FERNANDO_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("FERNANDO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Fernando4 } + }, + + [TRAINER_FERNANDO_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GUITARIST, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_GUITARIST, + .trainerName = _("FERNANDO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Fernando5 } + }, + + [TRAINER_SAWYER_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("SAWYER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer2 } + }, + + [TRAINER_SAWYER_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("SAWYER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer3 } + }, + + [TRAINER_SAWYER_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("SAWYER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer4 } + }, + + [TRAINER_SAWYER_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_HIKER, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER, + .trainerPic = TRAINER_PIC_HIKER, + .trainerName = _("SAWYER"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x7, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Sawyer5 } + }, + + [TRAINER_GABRIELLE_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("GABRIELLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle2 } + }, + + [TRAINER_GABRIELLE_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("GABRIELLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle3 } + }, + + [TRAINER_GABRIELLE_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("GABRIELLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle4 } + }, + + [TRAINER_GABRIELLE_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_BREEDER, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F, + .trainerName = _("GABRIELLE"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 6, + .party = {.NoItemDefaultMoves = gTrainerParty_Gabrielle5 } + }, + + [TRAINER_THALIA_2] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("THALIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Thalia2 } + }, + + [TRAINER_THALIA_3] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("THALIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Thalia3 } + }, + + [TRAINER_THALIA_4] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("THALIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Thalia4 } + }, + + [TRAINER_THALIA_5] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_BEAUTY, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE, + .trainerPic = TRAINER_PIC_BEAUTY, + .trainerName = _("THALIA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x1, + .partySize = 3, + .party = {.NoItemDefaultMoves = gTrainerParty_Thalia5 } + }, + + [TRAINER_MARIELA] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_F, + .trainerName = _("MARIELA"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Mariela } + }, + + [TRAINER_ALVARO] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PSYCHIC, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE, + .trainerPic = TRAINER_PIC_PSYCHIC_M, + .trainerName = _("ALVARO"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 2, + .party = {.NoItemDefaultMoves = gTrainerParty_Alvaro } + }, + + [TRAINER_EVERETT] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_GENTLEMAN, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH, + .trainerPic = TRAINER_PIC_GENTLEMAN, + .trainerName = _("EVERETT"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Everett } + }, + + [TRAINER_RED] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_RED, + .trainerName = _("RED"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Red } + }, + + [TRAINER_LEAF] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_LEAF, + .trainerName = _("LEAF"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Leaf } + }, + + [TRAINER_BRENDAN_16] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, + .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, + .trainerName = _("BRENDAN"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan16 } + }, + + [TRAINER_MAY_16] = + { + .partyFlags = 0, + .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, + .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, + .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_MAY, + .trainerName = _("MAY"), + .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, + .doubleBattle = FALSE, + .aiFlags = 0x0, + .partySize = 1, + .party = {.NoItemDefaultMoves = gTrainerParty_May16 } + }, +}; -- cgit v1.2.3 From 3d04105488e0cb2bc712c657f3a7d5e855069ce9 Mon Sep 17 00:00:00 2001 From: vblm12 Date: Sat, 21 Jul 2018 01:51:44 -0500 Subject: Remove unnecessary files. --- data/text/move_names.inc | 356 -- data/text/species_names.inc | 413 -- data/text/trainer_class_names.inc | 67 - data/trainer_parties.inc | 11268 ------------------------------------ data/trainers.inc | 10261 -------------------------------- 5 files changed, 22365 deletions(-) delete mode 100644 data/text/move_names.inc delete mode 100644 data/text/species_names.inc delete mode 100644 data/text/trainer_class_names.inc delete mode 100644 data/trainer_parties.inc delete mode 100644 data/trainers.inc diff --git a/data/text/move_names.inc b/data/text/move_names.inc deleted file mode 100644 index 5efb85fc7..000000000 --- a/data/text/move_names.inc +++ /dev/null @@ -1,356 +0,0 @@ -gMoveNames:: @ 831977C - .string "-$", 13 - .string "POUND$", 13 - .string "KARATE CHOP$", 13 - .string "DOUBLESLAP$", 13 - .string "COMET PUNCH$", 13 - .string "MEGA PUNCH$", 13 - .string "PAY DAY$", 13 - .string "FIRE PUNCH$", 13 - .string "ICE PUNCH$", 13 - .string "THUNDERPUNCH$", 13 - .string "SCRATCH$", 13 - .string "VICEGRIP$", 13 - .string "GUILLOTINE$", 13 - .string "RAZOR WIND$", 13 - .string "SWORDS DANCE$", 13 - .string "CUT$", 13 - .string "GUST$", 13 - .string "WING ATTACK$", 13 - .string "WHIRLWIND$", 13 - .string "FLY$", 13 - .string "BIND$", 13 - .string "SLAM$", 13 - .string "VINE WHIP$", 13 - .string "STOMP$", 13 - .string "DOUBLE KICK$", 13 - .string "MEGA KICK$", 13 - .string "JUMP KICK$", 13 - .string "ROLLING KICK$", 13 - .string "SAND-ATTACK$", 13 - .string "HEADBUTT$", 13 - .string "HORN ATTACK$", 13 - .string "FURY ATTACK$", 13 - .string "HORN DRILL$", 13 - .string "TACKLE$", 13 - .string "BODY SLAM$", 13 - .string "WRAP$", 13 - .string "TAKE DOWN$", 13 - .string "THRASH$", 13 - .string "DOUBLE-EDGE$", 13 - .string "TAIL WHIP$", 13 - .string "POISON STING$", 13 - .string "TWINEEDLE$", 13 - .string "PIN MISSILE$", 13 - .string "LEER$", 13 - .string "BITE$", 13 - .string "GROWL$", 13 - .string "ROAR$", 13 - .string "SING$", 13 - .string "SUPERSONIC$", 13 - .string "SONICBOOM$", 13 - .string "DISABLE$", 13 - .string "ACID$", 13 - .string "EMBER$", 13 - .string "FLAMETHROWER$", 13 - .string "MIST$", 13 - .string "WATER GUN$", 13 - .string "HYDRO PUMP$", 13 - .string "SURF$", 13 - .string "ICE BEAM$", 13 - .string "BLIZZARD$", 13 - .string "PSYBEAM$", 13 - .string "BUBBLEBEAM$", 13 - .string "AURORA BEAM$", 13 - .string "HYPER BEAM$", 13 - .string "PECK$", 13 - .string "DRILL PECK$", 13 - .string "SUBMISSION$", 13 - .string "LOW KICK$", 13 - .string "COUNTER$", 13 - .string "SEISMIC TOSS$", 13 - .string "STRENGTH$", 13 - .string "ABSORB$", 13 - .string "MEGA DRAIN$", 13 - .string "LEECH SEED$", 13 - .string "GROWTH$", 13 - .string "RAZOR LEAF$", 13 - .string "SOLARBEAM$", 13 - .string "POISONPOWDER$", 13 - .string "STUN SPORE$", 13 - .string "SLEEP POWDER$", 13 - .string "PETAL DANCE$", 13 - .string "STRING SHOT$", 13 - .string "DRAGON RAGE$", 13 - .string "FIRE SPIN$", 13 - .string "THUNDERSHOCK$", 13 - .string "THUNDERBOLT$", 13 - .string "THUNDER WAVE$", 13 - .string "THUNDER$", 13 - .string "ROCK THROW$", 13 - .string "EARTHQUAKE$", 13 - .string "FISSURE$", 13 - .string "DIG$", 13 - .string "TOXIC$", 13 - .string "CONFUSION$", 13 - .string "PSYCHIC$", 13 - .string "HYPNOSIS$", 13 - .string "MEDITATE$", 13 - .string "AGILITY$", 13 - .string "QUICK ATTACK$", 13 - .string "RAGE$", 13 - .string "TELEPORT$", 13 - .string "NIGHT SHADE$", 13 - .string "MIMIC$", 13 - .string "SCREECH$", 13 - .string "DOUBLE TEAM$", 13 - .string "RECOVER$", 13 - .string "HARDEN$", 13 - .string "MINIMIZE$", 13 - .string "SMOKESCREEN$", 13 - .string "CONFUSE RAY$", 13 - .string "WITHDRAW$", 13 - .string "DEFENSE CURL$", 13 - .string "BARRIER$", 13 - .string "LIGHT SCREEN$", 13 - .string "HAZE$", 13 - .string "REFLECT$", 13 - .string "FOCUS ENERGY$", 13 - .string "BIDE$", 13 - .string "METRONOME$", 13 - .string "MIRROR MOVE$", 13 - .string "SELFDESTRUCT$", 13 - .string "EGG BOMB$", 13 - .string "LICK$", 13 - .string "SMOG$", 13 - .string "SLUDGE$", 13 - .string "BONE CLUB$", 13 - .string "FIRE BLAST$", 13 - .string "WATERFALL$", 13 - .string "CLAMP$", 13 - .string "SWIFT$", 13 - .string "SKULL BASH$", 13 - .string "SPIKE CANNON$", 13 - .string "CONSTRICT$", 13 - .string "AMNESIA$", 13 - .string "KINESIS$", 13 - .string "SOFTBOILED$", 13 - .string "HI JUMP KICK$", 13 - .string "GLARE$", 13 - .string "DREAM EATER$", 13 - .string "POISON GAS$", 13 - .string "BARRAGE$", 13 - .string "LEECH LIFE$", 13 - .string "LOVELY KISS$", 13 - .string "SKY ATTACK$", 13 - .string "TRANSFORM$", 13 - .string "BUBBLE$", 13 - .string "DIZZY PUNCH$", 13 - .string "SPORE$", 13 - .string "FLASH$", 13 - .string "PSYWAVE$", 13 - .string "SPLASH$", 13 - .string "ACID ARMOR$", 13 - .string "CRABHAMMER$", 13 - .string "EXPLOSION$", 13 - .string "FURY SWIPES$", 13 - .string "BONEMERANG$", 13 - .string "REST$", 13 - .string "ROCK SLIDE$", 13 - .string "HYPER FANG$", 13 - .string "SHARPEN$", 13 - .string "CONVERSION$", 13 - .string "TRI ATTACK$", 13 - .string "SUPER FANG$", 13 - .string "SLASH$", 13 - .string "SUBSTITUTE$", 13 - .string "STRUGGLE$", 13 - .string "SKETCH$", 13 - .string "TRIPLE KICK$", 13 - .string "THIEF$", 13 - .string "SPIDER WEB$", 13 - .string "MIND READER$", 13 - .string "NIGHTMARE$", 13 - .string "FLAME WHEEL$", 13 - .string "SNORE$", 13 - .string "CURSE$", 13 - .string "FLAIL$", 13 - .string "CONVERSION 2$", 13 - .string "AEROBLAST$", 13 - .string "COTTON SPORE$", 13 - .string "REVERSAL$", 13 - .string "SPITE$", 13 - .string "POWDER SNOW$", 13 - .string "PROTECT$", 13 - .string "MACH PUNCH$", 13 - .string "SCARY FACE$", 13 - .string "FAINT ATTACK$", 13 - .string "SWEET KISS$", 13 - .string "BELLY DRUM$", 13 - .string "SLUDGE BOMB$", 13 - .string "MUD-SLAP$", 13 - .string "OCTAZOOKA$", 13 - .string "SPIKES$", 13 - .string "ZAP CANNON$", 13 - .string "FORESIGHT$", 13 - .string "DESTINY BOND$", 13 - .string "PERISH SONG$", 13 - .string "ICY WIND$", 13 - .string "DETECT$", 13 - .string "BONE RUSH$", 13 - .string "LOCK-ON$", 13 - .string "OUTRAGE$", 13 - .string "SANDSTORM$", 13 - .string "GIGA DRAIN$", 13 - .string "ENDURE$", 13 - .string "CHARM$", 13 - .string "ROLLOUT$", 13 - .string "FALSE SWIPE$", 13 - .string "SWAGGER$", 13 - .string "MILK DRINK$", 13 - .string "SPARK$", 13 - .string "FURY CUTTER$", 13 - .string "STEEL WING$", 13 - .string "MEAN LOOK$", 13 - .string "ATTRACT$", 13 - .string "SLEEP TALK$", 13 - .string "HEAL BELL$", 13 - .string "RETURN$", 13 - .string "PRESENT$", 13 - .string "FRUSTRATION$", 13 - .string "SAFEGUARD$", 13 - .string "PAIN SPLIT$", 13 - .string "SACRED FIRE$", 13 - .string "MAGNITUDE$", 13 - .string "DYNAMICPUNCH$", 13 - .string "MEGAHORN$", 13 - .string "DRAGONBREATH$", 13 - .string "BATON PASS$", 13 - .string "ENCORE$", 13 - .string "PURSUIT$", 13 - .string "RAPID SPIN$", 13 - .string "SWEET SCENT$", 13 - .string "IRON TAIL$", 13 - .string "METAL CLAW$", 13 - .string "VITAL THROW$", 13 - .string "MORNING SUN$", 13 - .string "SYNTHESIS$", 13 - .string "MOONLIGHT$", 13 - .string "HIDDEN POWER$", 13 - .string "CROSS CHOP$", 13 - .string "TWISTER$", 13 - .string "RAIN DANCE$", 13 - .string "SUNNY DAY$", 13 - .string "CRUNCH$", 13 - .string "MIRROR COAT$", 13 - .string "PSYCH UP$", 13 - .string "EXTREMESPEED$", 13 - .string "ANCIENTPOWER$", 13 - .string "SHADOW BALL$", 13 - .string "FUTURE SIGHT$", 13 - .string "ROCK SMASH$", 13 - .string "WHIRLPOOL$", 13 - .string "BEAT UP$", 13 - .string "FAKE OUT$", 13 - .string "UPROAR$", 13 - .string "STOCKPILE$", 13 - .string "SPIT UP$", 13 - .string "SWALLOW$", 13 - .string "HEAT WAVE$", 13 - .string "HAIL$", 13 - .string "TORMENT$", 13 - .string "FLATTER$", 13 - .string "WILL-O-WISP$", 13 - .string "MEMENTO$", 13 - .string "FACADE$", 13 - .string "FOCUS PUNCH$", 13 - .string "SMELLINGSALT$", 13 - .string "FOLLOW ME$", 13 - .string "NATURE POWER$", 13 - .string "CHARGE$", 13 - .string "TAUNT$", 13 - .string "HELPING HAND$", 13 - .string "TRICK$", 13 - .string "ROLE PLAY$", 13 - .string "WISH$", 13 - .string "ASSIST$", 13 - .string "INGRAIN$", 13 - .string "SUPERPOWER$", 13 - .string "MAGIC COAT$", 13 - .string "RECYCLE$", 13 - .string "REVENGE$", 13 - .string "BRICK BREAK$", 13 - .string "YAWN$", 13 - .string "KNOCK OFF$", 13 - .string "ENDEAVOR$", 13 - .string "ERUPTION$", 13 - .string "SKILL SWAP$", 13 - .string "IMPRISON$", 13 - .string "REFRESH$", 13 - .string "GRUDGE$", 13 - .string "SNATCH$", 13 - .string "SECRET POWER$", 13 - .string "DIVE$", 13 - .string "ARM THRUST$", 13 - .string "CAMOUFLAGE$", 13 - .string "TAIL GLOW$", 13 - .string "LUSTER PURGE$", 13 - .string "MIST BALL$", 13 - .string "FEATHERDANCE$", 13 - .string "TEETER DANCE$", 13 - .string "BLAZE KICK$", 13 - .string "MUD SPORT$", 13 - .string "ICE BALL$", 13 - .string "NEEDLE ARM$", 13 - .string "SLACK OFF$", 13 - .string "HYPER VOICE$", 13 - .string "POISON FANG$", 13 - .string "CRUSH CLAW$", 13 - .string "BLAST BURN$", 13 - .string "HYDRO CANNON$", 13 - .string "METEOR MASH$", 13 - .string "ASTONISH$", 13 - .string "WEATHER BALL$", 13 - .string "AROMATHERAPY$", 13 - .string "FAKE TEARS$", 13 - .string "AIR CUTTER$", 13 - .string "OVERHEAT$", 13 - .string "ODOR SLEUTH$", 13 - .string "ROCK TOMB$", 13 - .string "SILVER WIND$", 13 - .string "METAL SOUND$", 13 - .string "GRASSWHISTLE$", 13 - .string "TICKLE$", 13 - .string "COSMIC POWER$", 13 - .string "WATER SPOUT$", 13 - .string "SIGNAL BEAM$", 13 - .string "SHADOW PUNCH$", 13 - .string "EXTRASENSORY$", 13 - .string "SKY UPPERCUT$", 13 - .string "SAND TOMB$", 13 - .string "SHEER COLD$", 13 - .string "MUDDY WATER$", 13 - .string "BULLET SEED$", 13 - .string "AERIAL ACE$", 13 - .string "ICICLE SPEAR$", 13 - .string "IRON DEFENSE$", 13 - .string "BLOCK$", 13 - .string "HOWL$", 13 - .string "DRAGON CLAW$", 13 - .string "FRENZY PLANT$", 13 - .string "BULK UP$", 13 - .string "BOUNCE$", 13 - .string "MUD SHOT$", 13 - .string "POISON TAIL$", 13 - .string "COVET$", 13 - .string "VOLT TACKLE$", 13 - .string "MAGICAL LEAF$", 13 - .string "WATER SPORT$", 13 - .string "CALM MIND$", 13 - .string "LEAF BLADE$", 13 - .string "DRAGON DANCE$", 13 - .string "ROCK BLAST$", 13 - .string "SHOCK WAVE$", 13 - .string "WATER PULSE$", 13 - .string "DOOM DESIRE$", 13 - .string "PSYCHO BOOST$", 13 diff --git a/data/text/species_names.inc b/data/text/species_names.inc deleted file mode 100644 index f319d2dc7..000000000 --- a/data/text/species_names.inc +++ /dev/null @@ -1,413 +0,0 @@ -gSpeciesNames:: @ 83185C8 - .string "??????????$", 11 - .string "BULBASAUR$", 11 - .string "IVYSAUR$", 11 - .string "VENUSAUR$", 11 - .string "CHARMANDER$", 11 - .string "CHARMELEON$", 11 - .string "CHARIZARD$", 11 - .string "SQUIRTLE$", 11 - .string "WARTORTLE$", 11 - .string "BLASTOISE$", 11 - .string "CATERPIE$", 11 - .string "METAPOD$", 11 - .string "BUTTERFREE$", 11 - .string "WEEDLE$", 11 - .string "KAKUNA$", 11 - .string "BEEDRILL$", 11 - .string "PIDGEY$", 11 - .string "PIDGEOTTO$", 11 - .string "PIDGEOT$", 11 - .string "RATTATA$", 11 - .string "RATICATE$", 11 - .string "SPEAROW$", 11 - .string "FEAROW$", 11 - .string "EKANS$", 11 - .string "ARBOK$", 11 - .string "PIKACHU$", 11 - .string "RAICHU$", 11 - .string "SANDSHREW$", 11 - .string "SANDSLASH$", 11 - .string "NIDORAN♀$", 11 - .string "NIDORINA$", 11 - .string "NIDOQUEEN$", 11 - .string "NIDORAN♂$", 11 - .string "NIDORINO$", 11 - .string "NIDOKING$", 11 - .string "CLEFAIRY$", 11 - .string "CLEFABLE$", 11 - .string "VULPIX$", 11 - .string "NINETALES$", 11 - .string "JIGGLYPUFF$", 11 - .string "WIGGLYTUFF$", 11 - .string "ZUBAT$", 11 - .string "GOLBAT$", 11 - .string "ODDISH$", 11 - .string "GLOOM$", 11 - .string "VILEPLUME$", 11 - .string "PARAS$", 11 - .string "PARASECT$", 11 - .string "VENONAT$", 11 - .string "VENOMOTH$", 11 - .string "DIGLETT$", 11 - .string "DUGTRIO$", 11 - .string "MEOWTH$", 11 - .string "PERSIAN$", 11 - .string "PSYDUCK$", 11 - .string "GOLDUCK$", 11 - .string "MANKEY$", 11 - .string "PRIMEAPE$", 11 - .string "GROWLITHE$", 11 - .string "ARCANINE$", 11 - .string "POLIWAG$", 11 - .string "POLIWHIRL$", 11 - .string "POLIWRATH$", 11 - .string "ABRA$", 11 - .string "KADABRA$", 11 - .string "ALAKAZAM$", 11 - .string "MACHOP$", 11 - .string "MACHOKE$", 11 - .string "MACHAMP$", 11 - .string "BELLSPROUT$", 11 - .string "WEEPINBELL$", 11 - .string "VICTREEBEL$", 11 - .string "TENTACOOL$", 11 - .string "TENTACRUEL$", 11 - .string "GEODUDE$", 11 - .string "GRAVELER$", 11 - .string "GOLEM$", 11 - .string "PONYTA$", 11 - .string "RAPIDASH$", 11 - .string "SLOWPOKE$", 11 - .string "SLOWBRO$", 11 - .string "MAGNEMITE$", 11 - .string "MAGNETON$", 11 - .string "FARFETCH’D$", 11 - .string "DODUO$", 11 - .string "DODRIO$", 11 - .string "SEEL$", 11 - .string "DEWGONG$", 11 - .string "GRIMER$", 11 - .string "MUK$", 11 - .string "SHELLDER$", 11 - .string "CLOYSTER$", 11 - .string "GASTLY$", 11 - .string "HAUNTER$", 11 - .string "GENGAR$", 11 - .string "ONIX$", 11 - .string "DROWZEE$", 11 - .string "HYPNO$", 11 - .string "KRABBY$", 11 - .string "KINGLER$", 11 - .string "VOLTORB$", 11 - .string "ELECTRODE$", 11 - .string "EXEGGCUTE$", 11 - .string "EXEGGUTOR$", 11 - .string "CUBONE$", 11 - .string "MAROWAK$", 11 - .string "HITMONLEE$", 11 - .string "HITMONCHAN$", 11 - .string "LICKITUNG$", 11 - .string "KOFFING$", 11 - .string "WEEZING$", 11 - .string "RHYHORN$", 11 - .string "RHYDON$", 11 - .string "CHANSEY$", 11 - .string "TANGELA$", 11 - .string "KANGASKHAN$", 11 - .string "HORSEA$", 11 - .string "SEADRA$", 11 - .string "GOLDEEN$", 11 - .string "SEAKING$", 11 - .string "STARYU$", 11 - .string "STARMIE$", 11 - .string "MR. MIME$", 11 - .string "SCYTHER$", 11 - .string "JYNX$", 11 - .string "ELECTABUZZ$", 11 - .string "MAGMAR$", 11 - .string "PINSIR$", 11 - .string "TAUROS$", 11 - .string "MAGIKARP$", 11 - .string "GYARADOS$", 11 - .string "LAPRAS$", 11 - .string "DITTO$", 11 - .string "EEVEE$", 11 - .string "VAPOREON$", 11 - .string "JOLTEON$", 11 - .string "FLAREON$", 11 - .string "PORYGON$", 11 - .string "OMANYTE$", 11 - .string "OMASTAR$", 11 - .string "KABUTO$", 11 - .string "KABUTOPS$", 11 - .string "AERODACTYL$", 11 - .string "SNORLAX$", 11 - .string "ARTICUNO$", 11 - .string "ZAPDOS$", 11 - .string "MOLTRES$", 11 - .string "DRATINI$", 11 - .string "DRAGONAIR$", 11 - .string "DRAGONITE$", 11 - .string "MEWTWO$", 11 - .string "MEW$", 11 - .string "CHIKORITA$", 11 - .string "BAYLEEF$", 11 - .string "MEGANIUM$", 11 - .string "CYNDAQUIL$", 11 - .string "QUILAVA$", 11 - .string "TYPHLOSION$", 11 - .string "TOTODILE$", 11 - .string "CROCONAW$", 11 - .string "FERALIGATR$", 11 - .string "SENTRET$", 11 - .string "FURRET$", 11 - .string "HOOTHOOT$", 11 - .string "NOCTOWL$", 11 - .string "LEDYBA$", 11 - .string "LEDIAN$", 11 - .string "SPINARAK$", 11 - .string "ARIADOS$", 11 - .string "CROBAT$", 11 - .string "CHINCHOU$", 11 - .string "LANTURN$", 11 - .string "PICHU$", 11 - .string "CLEFFA$", 11 - .string "IGGLYBUFF$", 11 - .string "TOGEPI$", 11 - .string "TOGETIC$", 11 - .string "NATU$", 11 - .string "XATU$", 11 - .string "MAREEP$", 11 - .string "FLAAFFY$", 11 - .string "AMPHAROS$", 11 - .string "BELLOSSOM$", 11 - .string "MARILL$", 11 - .string "AZUMARILL$", 11 - .string "SUDOWOODO$", 11 - .string "POLITOED$", 11 - .string "HOPPIP$", 11 - .string "SKIPLOOM$", 11 - .string "JUMPLUFF$", 11 - .string "AIPOM$", 11 - .string "SUNKERN$", 11 - .string "SUNFLORA$", 11 - .string "YANMA$", 11 - .string "WOOPER$", 11 - .string "QUAGSIRE$", 11 - .string "ESPEON$", 11 - .string "UMBREON$", 11 - .string "MURKROW$", 11 - .string "SLOWKING$", 11 - .string "MISDREAVUS$", 11 - .string "UNOWN$", 11 - .string "WOBBUFFET$", 11 - .string "GIRAFARIG$", 11 - .string "PINECO$", 11 - .string "FORRETRESS$", 11 - .string "DUNSPARCE$", 11 - .string "GLIGAR$", 11 - .string "STEELIX$", 11 - .string "SNUBBULL$", 11 - .string "GRANBULL$", 11 - .string "QWILFISH$", 11 - .string "SCIZOR$", 11 - .string "SHUCKLE$", 11 - .string "HERACROSS$", 11 - .string "SNEASEL$", 11 - .string "TEDDIURSA$", 11 - .string "URSARING$", 11 - .string "SLUGMA$", 11 - .string "MAGCARGO$", 11 - .string "SWINUB$", 11 - .string "PILOSWINE$", 11 - .string "CORSOLA$", 11 - .string "REMORAID$", 11 - .string "OCTILLERY$", 11 - .string "DELIBIRD$", 11 - .string "MANTINE$", 11 - .string "SKARMORY$", 11 - .string "HOUNDOUR$", 11 - .string "HOUNDOOM$", 11 - .string "KINGDRA$", 11 - .string "PHANPY$", 11 - .string "DONPHAN$", 11 - .string "PORYGON2$", 11 - .string "STANTLER$", 11 - .string "SMEARGLE$", 11 - .string "TYROGUE$", 11 - .string "HITMONTOP$", 11 - .string "SMOOCHUM$", 11 - .string "ELEKID$", 11 - .string "MAGBY$", 11 - .string "MILTANK$", 11 - .string "BLISSEY$", 11 - .string "RAIKOU$", 11 - .string "ENTEI$", 11 - .string "SUICUNE$", 11 - .string "LARVITAR$", 11 - .string "PUPITAR$", 11 - .string "TYRANITAR$", 11 - .string "LUGIA$", 11 - .string "HO-OH$", 11 - .string "CELEBI$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "TREECKO$", 11 - .string "GROVYLE$", 11 - .string "SCEPTILE$", 11 - .string "TORCHIC$", 11 - .string "COMBUSKEN$", 11 - .string "BLAZIKEN$", 11 - .string "MUDKIP$", 11 - .string "MARSHTOMP$", 11 - .string "SWAMPERT$", 11 - .string "POOCHYENA$", 11 - .string "MIGHTYENA$", 11 - .string "ZIGZAGOON$", 11 - .string "LINOONE$", 11 - .string "WURMPLE$", 11 - .string "SILCOON$", 11 - .string "BEAUTIFLY$", 11 - .string "CASCOON$", 11 - .string "DUSTOX$", 11 - .string "LOTAD$", 11 - .string "LOMBRE$", 11 - .string "LUDICOLO$", 11 - .string "SEEDOT$", 11 - .string "NUZLEAF$", 11 - .string "SHIFTRY$", 11 - .string "NINCADA$", 11 - .string "NINJASK$", 11 - .string "SHEDINJA$", 11 - .string "TAILLOW$", 11 - .string "SWELLOW$", 11 - .string "SHROOMISH$", 11 - .string "BRELOOM$", 11 - .string "SPINDA$", 11 - .string "WINGULL$", 11 - .string "PELIPPER$", 11 - .string "SURSKIT$", 11 - .string "MASQUERAIN$", 11 - .string "WAILMER$", 11 - .string "WAILORD$", 11 - .string "SKITTY$", 11 - .string "DELCATTY$", 11 - .string "KECLEON$", 11 - .string "BALTOY$", 11 - .string "CLAYDOL$", 11 - .string "NOSEPASS$", 11 - .string "TORKOAL$", 11 - .string "SABLEYE$", 11 - .string "BARBOACH$", 11 - .string "WHISCASH$", 11 - .string "LUVDISC$", 11 - .string "CORPHISH$", 11 - .string "CRAWDAUNT$", 11 - .string "FEEBAS$", 11 - .string "MILOTIC$", 11 - .string "CARVANHA$", 11 - .string "SHARPEDO$", 11 - .string "TRAPINCH$", 11 - .string "VIBRAVA$", 11 - .string "FLYGON$", 11 - .string "MAKUHITA$", 11 - .string "HARIYAMA$", 11 - .string "ELECTRIKE$", 11 - .string "MANECTRIC$", 11 - .string "NUMEL$", 11 - .string "CAMERUPT$", 11 - .string "SPHEAL$", 11 - .string "SEALEO$", 11 - .string "WALREIN$", 11 - .string "CACNEA$", 11 - .string "CACTURNE$", 11 - .string "SNORUNT$", 11 - .string "GLALIE$", 11 - .string "LUNATONE$", 11 - .string "SOLROCK$", 11 - .string "AZURILL$", 11 - .string "SPOINK$", 11 - .string "GRUMPIG$", 11 - .string "PLUSLE$", 11 - .string "MINUN$", 11 - .string "MAWILE$", 11 - .string "MEDITITE$", 11 - .string "MEDICHAM$", 11 - .string "SWABLU$", 11 - .string "ALTARIA$", 11 - .string "WYNAUT$", 11 - .string "DUSKULL$", 11 - .string "DUSCLOPS$", 11 - .string "ROSELIA$", 11 - .string "SLAKOTH$", 11 - .string "VIGOROTH$", 11 - .string "SLAKING$", 11 - .string "GULPIN$", 11 - .string "SWALOT$", 11 - .string "TROPIUS$", 11 - .string "WHISMUR$", 11 - .string "LOUDRED$", 11 - .string "EXPLOUD$", 11 - .string "CLAMPERL$", 11 - .string "HUNTAIL$", 11 - .string "GOREBYSS$", 11 - .string "ABSOL$", 11 - .string "SHUPPET$", 11 - .string "BANETTE$", 11 - .string "SEVIPER$", 11 - .string "ZANGOOSE$", 11 - .string "RELICANTH$", 11 - .string "ARON$", 11 - .string "LAIRON$", 11 - .string "AGGRON$", 11 - .string "CASTFORM$", 11 - .string "VOLBEAT$", 11 - .string "ILLUMISE$", 11 - .string "LILEEP$", 11 - .string "CRADILY$", 11 - .string "ANORITH$", 11 - .string "ARMALDO$", 11 - .string "RALTS$", 11 - .string "KIRLIA$", 11 - .string "GARDEVOIR$", 11 - .string "BAGON$", 11 - .string "SHELGON$", 11 - .string "SALAMENCE$", 11 - .string "BELDUM$", 11 - .string "METANG$", 11 - .string "METAGROSS$", 11 - .string "REGIROCK$", 11 - .string "REGICE$", 11 - .string "REGISTEEL$", 11 - .string "KYOGRE$", 11 - .string "GROUDON$", 11 - .string "RAYQUAZA$", 11 - .string "LATIAS$", 11 - .string "LATIOS$", 11 - .string "JIRACHI$", 11 - .string "DEOXYS$", 11 - .string "CHIMECHO$", 11 diff --git a/data/text/trainer_class_names.inc b/data/text/trainer_class_names.inc deleted file mode 100644 index f4327471e..000000000 --- a/data/text/trainer_class_names.inc +++ /dev/null @@ -1,67 +0,0 @@ -gTrainerClassNames:: @ 830FCD4 - .string "{PKMN} TRAINER$", 13 - .string "{PKMN} TRAINER$", 13 - .string "HIKER$", 13 - .string "TEAM AQUA$", 13 - .string "{PKMN} BREEDER$", 13 - .string "COOLTRAINER$", 13 - .string "BIRD KEEPER$", 13 - .string "COLLECTOR$", 13 - .string "SWIMMER♂$", 13 - .string "TEAM MAGMA$", 13 - .string "EXPERT$", 13 - .string "AQUA ADMIN$", 13 - .string "BLACK BELT$", 13 - .string "AQUA LEADER$", 13 - .string "HEX MANIAC$", 13 - .string "AROMA LADY$", 13 - .string "RUIN MANIAC$", 13 - .string "INTERVIEWER$", 13 - .string "TUBER$", 13 - .string "TUBER$", 13 - .string "LADY$", 13 - .string "BEAUTY$", 13 - .string "RICH BOY$", 13 - .string "POKéMANIAC$", 13 - .string "GUITARIST$", 13 - .string "KINDLER$", 13 - .string "CAMPER$", 13 - .string "PICNICKER$", 13 - .string "BUG MANIAC$", 13 - .string "PSYCHIC$", 13 - .string "GENTLEMAN$", 13 - .string "ELITE FOUR$", 13 - .string "LEADER$", 13 - .string "SCHOOL KID$", 13 - .string "SR. AND JR.$", 13 - .string "WINSTRATE$", 13 - .string "POKéFAN$", 13 - .string "YOUNGSTER$", 13 - .string "CHAMPION$", 13 - .string "FISHERMAN$", 13 - .string "TRIATHLETE$", 13 - .string "DRAGON TAMER$", 13 - .string "NINJA BOY$", 13 - .string "BATTLE GIRL$", 13 - .string "PARASOL LADY$", 13 - .string "SWIMMER♀$", 13 - .string "TWINS$", 13 - .string "SAILOR$", 13 - .string "COOLTRAINER$", 13 - .string "MAGMA ADMIN$", 13 - .string "{PKMN} TRAINER$", 13 - .string "BUG CATCHER$", 13 - .string "{PKMN} RANGER$", 13 - .string "MAGMA LEADER$", 13 - .string "LASS$", 13 - .string "YOUNG COUPLE$", 13 - .string "OLD COUPLE$", 13 - .string "SIS AND BRO$", 13 - .string "SALON MAIDEN$", 13 - .string "DOME ACE$", 13 - .string "PALACE MAVEN$", 13 - .string "ARENA TYCOON$", 13 - .string "FACTORY HEAD$", 13 - .string "PIKE QUEEN$", 13 - .string "PYRAMID KING$", 13 - .string "{PKMN} TRAINER$", 13 diff --git a/data/trainer_parties.inc b/data/trainer_parties.inc deleted file mode 100644 index 66eaf81be..000000000 --- a/data/trainer_parties.inc +++ /dev/null @@ -1,11268 +0,0 @@ - .align 2 -gTrainerParty_Sawyer1:: @ 830B62C - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt1:: @ 830B634 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt2:: @ 830B63C - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt3:: @ 830B64C - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt4:: @ 830B654 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt5:: @ 830B65C - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt6:: @ 830B664 - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt7:: @ 830B66C - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Gabrielle1:: @ 830B674 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SKITTY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_LOTAD - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SEEDOT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt8:: @ 830B6A4 - .2byte 0 @ IV (0-255) - .2byte 9 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Marcel:: @ 830B6AC - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SHIFTRY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Alberto:: @ 830B6BC - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_XATU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ed:: @ 830B6CC - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_ZANGOOSE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_SEVIPER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt9:: @ 830B6DC - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Declan:: @ 830B6E4 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt10:: @ 830B6EC - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt11:: @ 830B6F4 - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt12:: @ 830B704 - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt13:: @ 830B714 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt14:: @ 830B72C - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt15:: @ 830B734 - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt16:: @ 830B744 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt17:: @ 830B74C - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt18:: @ 830B754 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt19:: @ 830B75C - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt20:: @ 830B76C - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt21:: @ 830B774 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt22:: @ 830B77C - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Fredrick:: @ 830B784 - .2byte 100 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Matt:: @ 830B794 - .2byte 50 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GOLBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Zander:: @ 830B7A4 - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shelly1:: @ 830B7AC - .2byte 50 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shelly2:: @ 830B7BC - .2byte 100 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Archie:: @ 830B7CC - .2byte 150 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_CROBAT - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Leah:: @ 830B7E4 - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SPOINK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Daisy:: @ 830B7EC - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Rose1:: @ 830B7FC - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Felix:: @ 830B814 - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MEDICHAM - .2byte MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_CLAYDOL - .2byte MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Violet:: @ 830B834 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Rose2:: @ 830B844 - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Rose3:: @ 830B854 - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Rose4:: @ 830B86C - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Rose5:: @ 830B884 - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dusty1:: @ 830B89C - .2byte 50 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_SANDSLASH - .2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Chip:: @ 830B8AC - .2byte 50 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_BALTOY - .2byte MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SANDSHREW - .2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SANDSLASH - .2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Foster:: @ 830B8DC - .2byte 100 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SANDSHREW - .2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SANDSLASH - .2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dusty2:: @ 830B8FC - .2byte 60 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SANDSLASH - .2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dusty3:: @ 830B90C - .2byte 70 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_SANDSLASH - .2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dusty4:: @ 830B91C - .2byte 80 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SANDSLASH - .2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dusty5:: @ 830B92C - .2byte 90 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_SANDSLASH - .2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - .2byte 0 @ padding - - .align 2 -gTrainerParty_GabbyAndTy1:: @ 830B93C - .2byte 50 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_WHISMUR - .2byte 0 @ padding - - .align 2 -gTrainerParty_GabbyAndTy2:: @ 830B94C - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_GabbyAndTy3:: @ 830B95C - .2byte 150 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_GabbyAndTy4:: @ 830B96C - .2byte 200 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_GabbyAndTy5:: @ 830B97C - .2byte 250 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .2byte 250 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_GabbyAndTy6:: @ 830B98C - .2byte 250 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MAGNETON - .2byte MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT - .2byte 0 @ padding - - .2byte 250 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_EXPLOUD - .2byte MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lola1:: @ 830B9AC - .2byte 10 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_AZURILL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_AZURILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Austina:: @ 830B9BC - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Gwen:: @ 830B9C4 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lola2:: @ 830B9CC - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lola3:: @ 830B9DC - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lola4:: @ 830B9EC - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lola5:: @ 830B9FC - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_AZUMARILL - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_AZUMARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ricky1:: @ 830BA0C - .2byte 10 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_ZIGZAGOON - .2byte MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Simon:: @ 830BA1C - .2byte 0 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_AZURILL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Charlie:: @ 830BA2C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ricky2:: @ 830BA34 - .2byte 10 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_LINOONE - .2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ricky3:: @ 830BA44 - .2byte 20 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_LINOONE - .2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ricky4:: @ 830BA54 - .2byte 30 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LINOONE - .2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ricky5:: @ 830BA64 - .2byte 40 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_LINOONE - .2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Randall:: @ 830BA74 - .2byte 255 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SWELLOW - .2byte ITEM_NONE - .2byte MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE - - .align 2 -gTrainerParty_Parker:: @ 830BA84 - .2byte 255 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SPINDA - .2byte ITEM_NONE - .2byte MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE - - .align 2 -gTrainerParty_George:: @ 830BA94 - .2byte 255 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SLAKOTH - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE - - .align 2 -gTrainerParty_Berke:: @ 830BAA4 - .2byte 255 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_VIGOROTH - .2byte ITEM_NONE - .2byte MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE - - .align 2 -gTrainerParty_Braxton:: @ 830BAB4 - .2byte 100 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_SWELLOW - .2byte MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_TRAPINCH - .2byte MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_WAILMER - .2byte MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MAGNETON - .2byte MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_SHIFTRY - .2byte MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Vincent:: @ 830BB04 - .2byte 100 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_SABLEYE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Leroy:: @ 830BB1C - .2byte 100 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_MAWILE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_STARMIE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wilton1:: @ 830BB2C - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Edgar:: @ 830BB44 - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_CACTURNE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Albert:: @ 830BB54 - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MUK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Samuel:: @ 830BB64 - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_MAWILE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Vito:: @ 830BB7C - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_DODRIO - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_ELECTRODE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_SHIFTRY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Owen:: @ 830BB9C - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_KECLEON - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_WAILORD - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wilton2:: @ 830BBB4 - .2byte 110 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .2byte 110 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 110 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wilton3:: @ 830BBCC - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wilton4:: @ 830BBE4 - .2byte 130 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wilton5:: @ 830BBFC - .2byte 140 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 140 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 140 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Warren:: @ 830BC14 - .2byte 100 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LUDICOLO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Mary:: @ 830BC24 - .2byte 255 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_DELCATTY - .2byte ITEM_NONE - .2byte MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE - - .align 2 -gTrainerParty_Alexia:: @ 830BC34 - .2byte 255 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WIGGLYTUFF - .2byte ITEM_NONE - .2byte MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE - - .align 2 -gTrainerParty_Jody:: @ 830BC44 - .2byte 255 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_ZANGOOSE - .2byte ITEM_NONE - .2byte MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE - - .align 2 -gTrainerParty_Wendy:: @ 830BC54 - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MAWILE - .2byte MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_ROSELIA - .2byte MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_PELIPPER - .2byte MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Keira:: @ 830BC84 - .2byte 100 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_LAIRON - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brooke1:: @ 830BC94 - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jennifer:: @ 830BCAC - .2byte 200 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_SABLEYE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Hope:: @ 830BCB4 - .2byte 100 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shannon:: @ 830BCBC - .2byte 100 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_CLAYDOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Michelle:: @ 830BCC4 - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_TORKOAL - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_LUDICOLO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Caroline:: @ 830BCDC - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SKARMORY - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SABLEYE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Julie:: @ 830BCEC - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_SANDSLASH - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_NINETALES - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brooke2:: @ 830BD04 - .2byte 110 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 110 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 110 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brooke3:: @ 830BD1C - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brooke4:: @ 830BD34 - .2byte 130 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brooke5:: @ 830BD4C - .2byte 140 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 140 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_CAMERUPT - .2byte 0 @ padding - - .2byte 140 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Patricia:: @ 830BD64 - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_BANETTE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_LUNATONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kindra:: @ 830BD74 - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_DUSKULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_SHUPPET - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tammy:: @ 830BD84 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_DUSKULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SHUPPET - .2byte 0 @ padding - - .align 2 -gTrainerParty_Valerie1:: @ 830BD94 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SABLEYE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tasha:: @ 830BD9C - .2byte 50 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SHUPPET - .2byte 0 @ padding - - .align 2 -gTrainerParty_Valerie2:: @ 830BDA4 - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SABLEYE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SPOINK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Valerie3:: @ 830BDB4 - .2byte 20 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_SPOINK - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_SABLEYE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Valerie4:: @ 830BDC4 - .2byte 30 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_SPOINK - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_SABLEYE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Valerie5:: @ 830BDD4 - .2byte 40 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_DUSKULL - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_SABLEYE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_GRUMPIG - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cindy1:: @ 830BDEC - .2byte 0 @ IV (0-255) - .2byte 7 @ level - .2byte SPECIES_ZIGZAGOON - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Daphne:: @ 830BDF4 - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_LUVDISC - .2byte ITEM_NUGGET - .2byte MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE - - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_LUVDISC - .2byte ITEM_NUGGET - .2byte MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE - - .align 2 -gTrainerParty_Grunt23:: @ 830BE14 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cindy2:: @ 830BE2C - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_ZIGZAGOON - .2byte ITEM_NUGGET - .2byte MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE - - .align 2 -gTrainerParty_Brianna:: @ 830BE3C - .2byte 150 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_SEAKING - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Naomi:: @ 830BE44 - .2byte 100 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_ROSELIA - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Cindy3:: @ 830BE4C - .2byte 10 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Cindy4:: @ 830BE54 - .2byte 20 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Cindy5:: @ 830BE5C - .2byte 30 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Cindy6:: @ 830BE64 - .2byte 40 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NUGGET - .2byte MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK - - .align 2 -gTrainerParty_Melissa:: @ 830BE74 - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sheila:: @ 830BE7C - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shirley:: @ 830BE84 - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jessica1:: @ 830BE8C - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_KECLEON - .2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SEVIPER - .2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Connie:: @ 830BEAC - .2byte 100 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Bridget:: @ 830BEB4 - .2byte 150 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_AZUMARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Olivia:: @ 830BEBC - .2byte 100 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_CLAMPERL - .2byte MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_CORPHISH - .2byte MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_LOMBRE - .2byte MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tiffany:: @ 830BEEC - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jessica2:: @ 830BEFC - .2byte 10 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_KECLEON - .2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_SEVIPER - .2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jessica3:: @ 830BF1C - .2byte 20 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_KECLEON - .2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_SEVIPER - .2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jessica4:: @ 830BF3C - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_KECLEON - .2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_SEVIPER - .2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jessica5:: @ 830BF5C - .2byte 40 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_KECLEON - .2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_SEVIPER - .2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Winston1:: @ 830BF7C - .2byte 0 @ IV (0-255) - .2byte 7 @ level - .2byte SPECIES_ZIGZAGOON - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Mollie:: @ 830BF84 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_WHISCASH - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Garret:: @ 830BF94 - .2byte 0 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_AZUMARILL - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Winston2:: @ 830BF9C - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Winston3:: @ 830BFA4 - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Winston4:: @ 830BFAC - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Winston5:: @ 830BFB4 - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NUGGET - .2byte MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK - - .align 2 -gTrainerParty_Steve1:: @ 830BFC4 - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Thalia1:: @ 830BFCC - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_HORSEA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Mark:: @ 830BFDC - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_RHYHORN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt24:: @ 830BFE4 - .2byte 0 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Steve2:: @ 830BFEC - .2byte 10 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_LAIRON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Steve3:: @ 830BFF4 - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LAIRON - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_RHYHORN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Steve4:: @ 830C004 - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LAIRON - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_RHYHORN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Steve5:: @ 830C014 - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_AGGRON - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_RHYDON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Luis:: @ 830C024 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dominik:: @ 830C02C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Douglas:: @ 830C034 - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Darrin:: @ 830C044 - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tony1:: @ 830C05C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jerome:: @ 830C064 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Matthew:: @ 830C06C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_David:: @ 830C074 - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Spencer:: @ 830C084 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Roland:: @ 830C094 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nolen:: @ 830C09C - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Stan:: @ 830C0A4 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_HORSEA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Barry:: @ 830C0AC - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dean:: @ 830C0B4 - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Rodney:: @ 830C0CC - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Richard:: @ 830C0D4 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Herman:: @ 830C0DC - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Santiago:: @ 830C0EC - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Gilbert:: @ 830C0FC - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Franklin:: @ 830C104 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SEALEO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kevin:: @ 830C10C - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SPHEAL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jack:: @ 830C114 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dudley:: @ 830C11C - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Chad:: @ 830C134 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tony2:: @ 830C144 - .2byte 10 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tony3:: @ 830C14C - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tony4:: @ 830C154 - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tony5:: @ 830C164 - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_STARMIE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Takao:: @ 830C174 - .2byte 127 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Hitoshi:: @ 830C17C - .2byte 50 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kiyo:: @ 830C18C - .2byte 100 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Koichi:: @ 830C194 - .2byte 100 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nob1:: @ 830C1A4 - .2byte 100 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nob2:: @ 830C1AC - .2byte 110 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nob3:: @ 830C1B4 - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nob4:: @ 830C1C4 - .2byte 130 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nob5:: @ 830C1DC - .2byte 140 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MACHOP - .2byte ITEM_NONE - - .2byte 140 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MACHOKE - .2byte ITEM_NONE - - .2byte 140 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MACHOKE - .2byte ITEM_NONE - - .2byte 140 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MACHAMP - .2byte ITEM_BLACK_BELT - - .align 2 -gTrainerParty_Yuji:: @ 830C1FC - .2byte 100 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Daisuke:: @ 830C20C - .2byte 100 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Atsushi:: @ 830C214 - .2byte 100 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kirk:: @ 830C21C - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_ELECTRIKE - .2byte MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_VOLTORB - .2byte MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt25:: @ 830C23C - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt26:: @ 830C24C - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shawn:: @ 830C254 - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_VOLTORB - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Fernando1:: @ 830C264 - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dalton1:: @ 830C274 - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_WHISMUR - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dalton2:: @ 830C284 - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_WHISMUR - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dalton3:: @ 830C29C - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dalton4:: @ 830C2B4 - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dalton5:: @ 830C2CC - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_EXPLOUD - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cole:: @ 830C2E4 - .2byte 100 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jeff:: @ 830C2EC - .2byte 100 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Axle:: @ 830C2FC - .2byte 100 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jace:: @ 830C304 - .2byte 100 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Keegan:: @ 830C30C - .2byte 120 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Bernie1:: @ 830C314 - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Bernie2:: @ 830C324 - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Bernie3:: @ 830C334 - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Bernie4:: @ 830C344 - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Bernie5:: @ 830C354 - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_MAGCARGO - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Drew:: @ 830C364 - .2byte 0 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_SANDSHREW - .2byte MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Beau:: @ 830C374 - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_BALTOY - .2byte MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_SANDSHREW - .2byte MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_BALTOY - .2byte MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB - .2byte 0 @ padding - - .align 2 -gTrainerParty_Larry:: @ 830C3A4 - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shane:: @ 830C3AC - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Justin:: @ 830C3BC - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_KECLEON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ethan1:: @ 830C3C4 - .2byte 0 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Autumn:: @ 830C3D4 - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Travis:: @ 830C3DC - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ethan2:: @ 830C3E4 - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ethan3:: @ 830C3F4 - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ethan4:: @ 830C404 - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ethan5:: @ 830C41C - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SANDSLASH - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brent:: @ 830C434 - .2byte 100 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Donald:: @ 830C43C - .2byte 100 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_SILCOON - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_BEAUTIFLY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Taylor:: @ 830C454 - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_CASCOON - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_DUSTOX - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jeffrey1:: @ 830C46C - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Derek:: @ 830C484 - .2byte 150 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_DUSTOX - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_BEAUTIFLY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jeffrey2:: @ 830C494 - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jeffrey3:: @ 830C4AC - .2byte 20 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MASQUERAIN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jeffrey4:: @ 830C4C4 - .2byte 30 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MASQUERAIN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jeffrey5:: @ 830C4E4 - .2byte 40 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_SURSKIT - .2byte ITEM_NONE - - .2byte 40 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_DUSTOX - .2byte ITEM_NONE - - .2byte 40 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_SURSKIT - .2byte ITEM_NONE - - .2byte 40 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_MASQUERAIN - .2byte ITEM_SILVER_POWDER - - .2byte 40 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_BEAUTIFLY - .2byte ITEM_NONE - - .align 2 -gTrainerParty_Edward:: @ 830C50C - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_ABRA - .2byte MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Preston:: @ 830C51C - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_KIRLIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Virgil:: @ 830C524 - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_RALTS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Blake:: @ 830C52C - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_GIRAFARIG - .2byte 0 @ padding - - .align 2 -gTrainerParty_William:: @ 830C534 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_RALTS - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_RALTS - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_KIRLIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Joshua:: @ 830C54C - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_SOLROCK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cameron1:: @ 830C55C - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SOLROCK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cameron2:: @ 830C564 - .2byte 10 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SOLROCK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cameron3:: @ 830C574 - .2byte 20 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_SOLROCK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cameron4:: @ 830C584 - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_SOLROCK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cameron5:: @ 830C594 - .2byte 40 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_SOLROCK - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_ALAKAZAM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jaclyn:: @ 830C5A4 - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_ABRA - .2byte MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Hannah:: @ 830C5B4 - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_KIRLIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Samantha:: @ 830C5BC - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_XATU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Maura:: @ 830C5C4 - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kayla:: @ 830C5CC - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WOBBUFFET - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_NATU - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Alexis:: @ 830C5E4 - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_KIRLIA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_XATU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jacki1:: @ 830C5F4 - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_LUNATONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jacki2:: @ 830C604 - .2byte 10 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_LUNATONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jacki3:: @ 830C614 - .2byte 20 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_LUNATONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jacki4:: @ 830C624 - .2byte 30 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_LUNATONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jacki5:: @ 830C634 - .2byte 40 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_LUNATONE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_ALAKAZAM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Walter1:: @ 830C644 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Micah:: @ 830C64C - .2byte 0 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Thomas:: @ 830C65C - .2byte 0 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_ZANGOOSE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Walter2:: @ 830C664 - .2byte 10 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Walter3:: @ 830C66C - .2byte 20 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_LINOONE - .2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MANECTRIC - .2byte MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR - .2byte 0 @ padding - - .align 2 -gTrainerParty_Walter4:: @ 830C68C - .2byte 30 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_LINOONE - .2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MANECTRIC - .2byte MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Walter5:: @ 830C6AC - .2byte 40 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_LINOONE - .2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_GOLDUCK - .2byte MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_MANECTRIC - .2byte MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sidney:: @ 830C6DC - .2byte 250 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_MIGHTYENA - .2byte ITEM_NONE - .2byte MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH - - .2byte 250 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_SHIFTRY - .2byte ITEM_NONE - .2byte MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY - - .2byte 250 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_CACTURNE - .2byte ITEM_NONE - .2byte MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE - - .2byte 250 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_CRAWDAUNT - .2byte ITEM_NONE - .2byte MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE - - .2byte 255 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_ABSOL - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH - - .align 2 -gTrainerParty_Phoebe:: @ 830C72C - .2byte 250 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_DUSCLOPS - .2byte ITEM_NONE - .2byte MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT - - .2byte 250 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_BANETTE - .2byte ITEM_NONE - .2byte MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK - - .2byte 250 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_SABLEYE - .2byte ITEM_NONE - .2byte MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK - - .2byte 250 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_BANETTE - .2byte ITEM_NONE - .2byte MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE - - .2byte 255 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_DUSCLOPS - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE - - .align 2 -gTrainerParty_Glacia:: @ 830C77C - .2byte 250 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_SEALEO - .2byte ITEM_NONE - .2byte MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL - - .2byte 250 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_GLALIE - .2byte ITEM_NONE - .2byte MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM - - .2byte 250 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_SEALEO - .2byte ITEM_NONE - .2byte MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD - - .2byte 250 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_GLALIE - .2byte ITEM_NONE - .2byte MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_WALREIN - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD - - .align 2 -gTrainerParty_Drake:: @ 830C7CC - .2byte 250 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_SHELGON - .2byte ITEM_NONE - .2byte MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE - - .2byte 250 @ IV (0-255) - .2byte 54 @ level - .2byte SPECIES_ALTARIA - .2byte ITEM_NONE - .2byte MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE - - .2byte 250 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_KINGDRA - .2byte ITEM_NONE - .2byte MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM - - .2byte 250 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_FLYGON - .2byte ITEM_NONE - .2byte MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_SALAMENCE - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH - - .align 2 -gTrainerParty_Roxanne1:: @ 830C81C - .2byte 100 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_GEODUDE - .2byte ITEM_NONE - .2byte MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB - - .2byte 100 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_GEODUDE - .2byte ITEM_NONE - .2byte MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB - - .2byte 200 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_NOSEPASS - .2byte ITEM_ORAN_BERRY - .2byte MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB - - .align 2 -gTrainerParty_Brawly1:: @ 830C84C - .2byte 100 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_MACHOP - .2byte ITEM_NONE - .2byte MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP - - .2byte 100 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_MEDITITE - .2byte ITEM_NONE - .2byte MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP - - .2byte 200 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_MAKUHITA - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP - - .align 2 -gTrainerParty_Wattson1:: @ 830C87C - .2byte 200 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_VOLTORB - .2byte ITEM_NONE - .2byte MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE - - .2byte 200 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_ELECTRIKE - .2byte ITEM_NONE - .2byte MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL - - .2byte 220 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_MAGNETON - .2byte ITEM_NONE - .2byte MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM - - .2byte 250 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_MANECTRIC - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL - - .align 2 -gTrainerParty_Flannery1:: @ 830C8BC - .2byte 200 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_NUMEL - .2byte ITEM_NONE - .2byte MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - - .2byte 200 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_SLUGMA - .2byte ITEM_NONE - .2byte MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY - - .2byte 250 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_CAMERUPT - .2byte ITEM_NONE - .2byte MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT - - .2byte 250 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_TORKOAL - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT - - .align 2 -gTrainerParty_Norman1:: @ 830C8FC - .2byte 200 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SPINDA - .2byte ITEM_NONE - .2byte MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE - - .2byte 200 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_VIGOROTH - .2byte ITEM_NONE - .2byte MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK - - .2byte 200 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NONE - .2byte MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT - - .2byte 250 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SLAKING - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK - - .align 2 -gTrainerParty_Winona1:: @ 830C93C - .2byte 210 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SWABLU - .2byte ITEM_NONE - .2byte MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE - - .2byte 210 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_TROPIUS - .2byte ITEM_NONE - .2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS - - .2byte 210 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_PELIPPER - .2byte ITEM_NONE - .2byte MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - - .2byte 220 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SKARMORY - .2byte ITEM_NONE - .2byte MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE - - .2byte 255 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_ALTARIA - .2byte ITEM_ORAN_BERRY - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE - - .align 2 -gTrainerParty_TateAndLiza1:: @ 830C98C - .2byte 250 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_CLAYDOL - .2byte ITEM_NONE - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - - .2byte 250 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_XATU - .2byte ITEM_NONE - .2byte MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - - .2byte 250 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_LUNATONE - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND - - .2byte 250 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_SOLROCK - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - - .align 2 -gTrainerParty_Juan1:: @ 830C9CC - .2byte 200 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_LUVDISC - .2byte ITEM_NONE - .2byte MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL - - .2byte 200 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_WHISCASH - .2byte ITEM_NONE - .2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE - - .2byte 200 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SEALEO - .2byte ITEM_NONE - .2byte MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE - - .2byte 200 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_CRAWDAUNT - .2byte ITEM_NONE - .2byte MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER - - .2byte 250 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_KINGDRA - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - - .align 2 -gTrainerParty_Jerry1:: @ 830CA1C - .2byte 10 @ IV (0-255) - .2byte 9 @ level - .2byte SPECIES_RALTS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ted:: @ 830CA24 - .2byte 10 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_RALTS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Paul:: @ 830CA2C - .2byte 10 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_ODDISH - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jerry2:: @ 830CA44 - .2byte 20 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_RALTS - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jerry3:: @ 830CA54 - .2byte 30 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_KIRLIA - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jerry4:: @ 830CA64 - .2byte 40 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_KIRLIA - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jerry5:: @ 830CA74 - .2byte 50 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_KIRLIA - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_BANETTE - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Karen1:: @ 830CA8C - .2byte 10 @ IV (0-255) - .2byte 9 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Georgia:: @ 830CA94 - .2byte 10 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_BEAUTIFLY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Karen2:: @ 830CAA4 - .2byte 20 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WHISMUR - .2byte 0 @ padding - - .align 2 -gTrainerParty_Karen3:: @ 830CAB4 - .2byte 30 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_Karen4:: @ 830CAC4 - .2byte 40 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_Karen5:: @ 830CAD4 - .2byte 50 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_EXPLOUD - .2byte 0 @ padding - - .align 2 -gTrainerParty_KateAndJoy:: @ 830CAE4 - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_SPINDA - .2byte MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SLAKING - .2byte MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .align 2 -gTrainerParty_AnnaAndMeg1:: @ 830CB04 - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_ZIGZAGOON - .2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MAKUHITA - .2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_AnnaAndMeg2:: @ 830CB24 - .2byte 10 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_ZIGZAGOON - .2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MAKUHITA - .2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_AnnaAndMeg3:: @ 830CB44 - .2byte 20 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_ZIGZAGOON - .2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MAKUHITA - .2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_AnnaAndMeg4:: @ 830CB64 - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_LINOONE - .2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MAKUHITA - .2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_AnnaAndMeg5:: @ 830CB84 - .2byte 40 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_LINOONE - .2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Victor:: @ 830CBA4 - .2byte 25 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_TAILLOW - .2byte ITEM_ORAN_BERRY - - .2byte 25 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_ZIGZAGOON - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Miguel1:: @ 830CBB4 - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_SKITTY - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Colton:: @ 830CBBC - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SKITTY - .2byte ITEM_ORAN_BERRY - .2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_SKITTY - .2byte ITEM_ORAN_BERRY - .2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - - .2byte 0 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_SKITTY - .2byte ITEM_ORAN_BERRY - .2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - - .2byte 0 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_SKITTY - .2byte ITEM_ORAN_BERRY - .2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_SKITTY - .2byte ITEM_ORAN_BERRY - .2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - - .2byte 0 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_DELCATTY - .2byte ITEM_ORAN_BERRY - .2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - - .align 2 -gTrainerParty_Miguel2:: @ 830CC1C - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SKITTY - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Miguel3:: @ 830CC24 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SKITTY - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Miguel4:: @ 830CC2C - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_DELCATTY - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Miguel5:: @ 830CC34 - .2byte 0 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_DELCATTY - .2byte ITEM_SITRUS_BERRY - - .align 2 -gTrainerParty_Victoria:: @ 830CC3C - .2byte 50 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_ROSELIA - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Vanessa:: @ 830CC44 - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_PIKACHU - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Bethany:: @ 830CC4C - .2byte 100 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_AZURILL - .2byte ITEM_ORAN_BERRY - - .2byte 100 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_MARILL - .2byte ITEM_ORAN_BERRY - - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_AZUMARILL - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Isabel1:: @ 830CC64 - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_PLUSLE - .2byte ITEM_ORAN_BERRY - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_MINUN - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Isabel2:: @ 830CC74 - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_PLUSLE - .2byte ITEM_ORAN_BERRY - - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MINUN - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Isabel3:: @ 830CC84 - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_PLUSLE - .2byte ITEM_ORAN_BERRY - - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MINUN - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Isabel4:: @ 830CC94 - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_PLUSLE - .2byte ITEM_ORAN_BERRY - - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MINUN - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Isabel5:: @ 830CCA4 - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_PLUSLE - .2byte ITEM_SITRUS_BERRY - - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_MINUN - .2byte ITEM_SITRUS_BERRY - - .align 2 -gTrainerParty_Timothy1:: @ 830CCB4 - .2byte 200 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Timothy2:: @ 830CCBC - .2byte 210 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG - .2byte 0 @ padding - - .align 2 -gTrainerParty_Timothy3:: @ 830CCCC - .2byte 220 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG - .2byte 0 @ padding - - .align 2 -gTrainerParty_Timothy4:: @ 830CCDC - .2byte 230 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG - .2byte 0 @ padding - - .align 2 -gTrainerParty_Timothy5:: @ 830CCEC - .2byte 240 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG - .2byte 0 @ padding - - .align 2 -gTrainerParty_Vicky:: @ 830CCFC - .2byte 200 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_MEDITITE - .2byte MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shelby1:: @ 830CD0C - .2byte 200 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shelby2:: @ 830CD1C - .2byte 210 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .2byte 210 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shelby3:: @ 830CD2C - .2byte 220 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .2byte 220 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shelby4:: @ 830CD3C - .2byte 230 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .2byte 230 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shelby5:: @ 830CD4C - .2byte 240 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .2byte 240 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Calvin1:: @ 830CD5C - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Billy:: @ 830CD64 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 7 @ level - .2byte SPECIES_SEEDOT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Josh:: @ 830CD74 - .2byte 100 @ IV (0-255) - .2byte 10 @ level - .2byte SPECIES_GEODUDE - .2byte MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tommy:: @ 830CD84 - .2byte 110 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Joey:: @ 830CD94 - .2byte 0 @ IV (0-255) - .2byte 9 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ben:: @ 830CD9C - .2byte 150 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_ZIGZAGOON - .2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_GULPIN - .2byte MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND - .2byte 0 @ padding - - .align 2 -gTrainerParty_Quincy:: @ 830CDBC - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SLAKING - .2byte MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_DUSCLOPS - .2byte MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Katelynn:: @ 830CDDC - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_GARDEVOIR - .2byte MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SLAKING - .2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jaylen:: @ 830CDFC - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_TRAPINCH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dillon:: @ 830CE04 - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Calvin2:: @ 830CE0C - .2byte 10 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Calvin3:: @ 830CE14 - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Calvin4:: @ 830CE24 - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Calvin5:: @ 830CE3C - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Eddie:: @ 830CE54 - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Allen:: @ 830CE64 - .2byte 0 @ IV (0-255) - .2byte 4 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 3 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Timmy:: @ 830CE74 - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wallace:: @ 830CE84 - .2byte 255 @ IV (0-255) - .2byte 57 @ level - .2byte SPECIES_WAILORD - .2byte ITEM_NONE - .2byte MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_TENTACRUEL - .2byte ITEM_NONE - .2byte MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM - - .2byte 255 @ IV (0-255) - .2byte 56 @ level - .2byte SPECIES_LUDICOLO - .2byte ITEM_NONE - .2byte MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM - - .2byte 255 @ IV (0-255) - .2byte 56 @ level - .2byte SPECIES_WHISCASH - .2byte ITEM_NONE - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM - - .2byte 255 @ IV (0-255) - .2byte 56 @ level - .2byte SPECIES_GYARADOS - .2byte ITEM_NONE - .2byte MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF - - .2byte 255 @ IV (0-255) - .2byte 58 @ level - .2byte SPECIES_MILOTIC - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC - - .align 2 -gTrainerParty_Andrew:: @ 830CEE4 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 10 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ivan:: @ 830CEFC - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 7 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Claude:: @ 830CF14 - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_BARBOACH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Elliot1:: @ 830CF2C - .2byte 0 @ IV (0-255) - .2byte 10 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 7 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 10 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ned:: @ 830CF44 - .2byte 10 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dale:: @ 830CF4C - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nolan:: @ 830CF6C - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_BARBOACH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Barny:: @ 830CF74 - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wade:: @ 830CF84 - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Carter:: @ 830CF8C - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Elliot2:: @ 830CF9C - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Elliot3:: @ 830CFB4 - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Elliot4:: @ 830CFD4 - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .2byte 31 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Elliot5:: @ 830CFF4 - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ronald:: @ 830D014 - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jacob:: @ 830D044 - .2byte 20 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_VOLTORB - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_VOLTORB - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Anthony:: @ 830D05C - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Benjamin1:: @ 830D06C - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Benjamin2:: @ 830D074 - .2byte 10 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Benjamin3:: @ 830D07C - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Benjamin4:: @ 830D084 - .2byte 30 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Benjamin5:: @ 830D08C - .2byte 40 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Abigail1:: @ 830D094 - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jasmine:: @ 830D09C - .2byte 80 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .2byte 80 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_VOLTORB - .2byte 0 @ padding - - .align 2 -gTrainerParty_Abigail2:: @ 830D0B4 - .2byte 10 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Abigail3:: @ 830D0BC - .2byte 20 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Abigail4:: @ 830D0C4 - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Abigail5:: @ 830D0CC - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_MAGNETON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dylan1:: @ 830D0D4 - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dylan2:: @ 830D0DC - .2byte 10 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dylan3:: @ 830D0E4 - .2byte 20 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dylan4:: @ 830D0EC - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_DODRIO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dylan5:: @ 830D0F4 - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_DODRIO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Maria1:: @ 830D0FC - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Maria2:: @ 830D104 - .2byte 10 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Maria3:: @ 830D10C - .2byte 20 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Maria4:: @ 830D114 - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_DODRIO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Maria5:: @ 830D11C - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_DODRIO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Camden:: @ 830D124 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Demetrius:: @ 830D134 - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaiah1:: @ 830D144 - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Pablo1:: @ 830D14C - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Chase:: @ 830D15C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 80 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaiah2:: @ 830D16C - .2byte 10 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaiah3:: @ 830D174 - .2byte 20 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaiah4:: @ 830D17C - .2byte 30 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_STARMIE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaiah5:: @ 830D184 - .2byte 40 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_STARMIE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isobel:: @ 830D18C - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Donny:: @ 830D194 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 160 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Talia:: @ 830D1A4 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Katelyn1:: @ 830D1AC - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Allison:: @ 830D1B4 - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 240 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Katelyn2:: @ 830D1C4 - .2byte 10 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Katelyn3:: @ 830D1CC - .2byte 20 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Katelyn4:: @ 830D1D4 - .2byte 30 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_STARMIE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Katelyn5:: @ 830D1DC - .2byte 40 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_STARMIE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nicolas1:: @ 830D1E4 - .2byte 100 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nicolas2:: @ 830D1F4 - .2byte 110 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .2byte 110 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nicolas3:: @ 830D204 - .2byte 120 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nicolas4:: @ 830D214 - .2byte 130 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_BAGON - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nicolas5:: @ 830D22C - .2byte 140 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_ALTARIA - .2byte ITEM_NONE - - .2byte 140 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_ALTARIA - .2byte ITEM_NONE - - .2byte 140 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_SHELGON - .2byte ITEM_DRAGON_FANG - - .align 2 -gTrainerParty_Aaron:: @ 830D244 - .2byte 255 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_BAGON - .2byte MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Perry:: @ 830D254 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Hugh:: @ 830D25C - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Phil:: @ 830D26C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jared:: @ 830D274 - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SKARMORY - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Humberto:: @ 830D28C - .2byte 250 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_SKARMORY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Presley:: @ 830D294 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_XATU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Edwardo:: @ 830D2A4 - .2byte 150 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Colin:: @ 830D2B4 - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_NATU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Robert1:: @ 830D2C4 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Benny:: @ 830D2CC - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_XATU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Chester:: @ 830D2E4 - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Robert2:: @ 830D2F4 - .2byte 10 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_NATU - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Robert3:: @ 830D304 - .2byte 20 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_NATU - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Robert4:: @ 830D314 - .2byte 30 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_NATU - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Robert5:: @ 830D324 - .2byte 40 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_XATU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Alex:: @ 830D334 - .2byte 150 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_NATU - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Beck:: @ 830D344 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Yasu:: @ 830D34C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Takashi:: @ 830D354 - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_KOFFING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dianne:: @ 830D364 - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_CLAYDOL - .2byte ITEM_NONE - .2byte MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_LANTURN - .2byte ITEM_NONE - .2byte MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - - .align 2 -gTrainerParty_Jani:: @ 830D384 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lao1:: @ 830D38C - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lung:: @ 830D3BC - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_KOFFING - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lao2:: @ 830D3CC - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lao3:: @ 830D40C - .2byte 20 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lao4:: @ 830D44C - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lao5:: @ 830D48C - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_KOFFING - .2byte ITEM_NONE - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_KOFFING - .2byte ITEM_NONE - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_KOFFING - .2byte ITEM_NONE - .2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - - .2byte 40 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_WEEZING - .2byte ITEM_SMOKE_BALL - .2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - - .align 2 -gTrainerParty_Jocelyn:: @ 830D4CC - .2byte 127 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Laura:: @ 830D4D4 - .2byte 150 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cyndy1:: @ 830D4DC - .2byte 100 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cora:: @ 830D4EC - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Paula:: @ 830D4F4 - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cyndy2:: @ 830D4FC - .2byte 110 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .2byte 110 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cyndy3:: @ 830D50C - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cyndy4:: @ 830D51C - .2byte 130 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cyndy5:: @ 830D52C - .2byte 140 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .2byte 140 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Madeline1:: @ 830D53C - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_NUMEL - .2byte MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Clarissa:: @ 830D54C - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Angelica:: @ 830D55C - .2byte 50 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_CASTFORM - .2byte MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Madeline2:: @ 830D56C - .2byte 10 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_NUMEL - .2byte MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Madeline3:: @ 830D57C - .2byte 20 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_NUMEL - .2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Madeline4:: @ 830D58C - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_ROSELIA - .2byte MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_NUMEL - .2byte MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Madeline5:: @ 830D5AC - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_ROSELIA - .2byte MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_CAMERUPT - .2byte MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Beverly:: @ 830D5CC - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Imani:: @ 830D5DC - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kyla:: @ 830D5E4 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Denise:: @ 830D5EC - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Beth:: @ 830D5FC - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tara:: @ 830D604 - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_HORSEA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Missy:: @ 830D614 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Alice:: @ 830D61C - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jenny1:: @ 830D634 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grace:: @ 830D63C - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tanya:: @ 830D644 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sharon:: @ 830D64C - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SEAKING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nikki:: @ 830D654 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SPHEAL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brenda:: @ 830D664 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Katie:: @ 830D66C - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SPHEAL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Susie:: @ 830D67C - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kara:: @ 830D684 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SEAKING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dana:: @ 830D68C - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_AZUMARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sienna:: @ 830D694 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Debra:: @ 830D6A4 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SEAKING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Linda:: @ 830D6AC - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_HORSEA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SEADRA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kaylee:: @ 830D6BC - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_LANTURN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Laurel:: @ 830D6CC - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Carlee:: @ 830D6DC - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_SEAKING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jenny2:: @ 830D6E4 - .2byte 0 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jenny3:: @ 830D6EC - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jenny4:: @ 830D6F4 - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jenny5:: @ 830D704 - .2byte 0 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_STARMIE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Heidi:: @ 830D71C - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SANDSHREW - .2byte MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_BALTOY - .2byte MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB - .2byte 0 @ padding - - .align 2 -gTrainerParty_Becky:: @ 830D73C - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SANDSHREW - .2byte MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_MARILL - .2byte MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Carol:: @ 830D75C - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nancy:: @ 830D76C - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Martha:: @ 830D77C - .2byte 0 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_SKITTY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Diana1:: @ 830D78C - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_ODDISH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cedric:: @ 830D7A4 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_WOBBUFFET - .2byte MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Irene:: @ 830D7B4 - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Diana2:: @ 830D7C4 - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Diana3:: @ 830D7DC - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Diana4:: @ 830D7F4 - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Diana5:: @ 830D80C - .2byte 40 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_VILEPLUME - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_ALTARIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_AmyAndLiv1:: @ 830D824 - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_PLUSLE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MINUN - .2byte 0 @ padding - - .align 2 -gTrainerParty_AmyAndLiv2:: @ 830D834 - .2byte 10 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_PLUSLE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_MINUN - .2byte 0 @ padding - - .align 2 -gTrainerParty_GinaAndMia1:: @ 830D844 - .2byte 0 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_SEEDOT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_LOTAD - .2byte 0 @ padding - - .align 2 -gTrainerParty_MiuAndYuki:: @ 830D854 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_BEAUTIFLY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_DUSTOX - .2byte 0 @ padding - - .align 2 -gTrainerParty_AmyAndLiv3:: @ 830D864 - .2byte 0 @ IV (0-255) - .2byte 9 @ level - .2byte SPECIES_PLUSLE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 9 @ level - .2byte SPECIES_MINUN - .2byte 0 @ padding - - .align 2 -gTrainerParty_GinaAndMia2:: @ 830D874 - .2byte 0 @ IV (0-255) - .2byte 10 @ level - .2byte SPECIES_DUSKULL - .2byte MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 10 @ level - .2byte SPECIES_SHROOMISH - .2byte MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_AmyAndLiv4:: @ 830D894 - .2byte 20 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_PLUSLE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MINUN - .2byte 0 @ padding - - .align 2 -gTrainerParty_AmyAndLiv5:: @ 830D8A4 - .2byte 30 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_PLUSLE - .2byte MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MINUN - .2byte MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND - .2byte 0 @ padding - - .align 2 -gTrainerParty_AmyAndLiv6:: @ 830D8C4 - .2byte 40 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_PLUSLE - .2byte MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MINUN - .2byte MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND - .2byte 0 @ padding - - .align 2 -gTrainerParty_Huey:: @ 830D8E4 - .2byte 10 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Edmond:: @ 830D8F4 - .2byte 0 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ernest1:: @ 830D8FC - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dwayne:: @ 830D90C - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Phillip:: @ 830D924 - .2byte 0 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Leonard:: @ 830D934 - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Duncan:: @ 830D94C - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SPHEAL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ernest2:: @ 830D95C - .2byte 10 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ernest3:: @ 830D974 - .2byte 20 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ernest4:: @ 830D98C - .2byte 30 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ernest5:: @ 830D9A4 - .2byte 40 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Eli:: @ 830D9BC - .2byte 100 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Annika:: @ 830D9C4 - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_FEEBAS - .2byte ITEM_ORAN_BERRY - .2byte MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT - - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_FEEBAS - .2byte ITEM_ORAN_BERRY - .2byte MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT - - .align 2 -gTrainerParty_Jazmyn:: @ 830D9E4 - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_ABSOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jonas:: @ 830D9EC - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kayley:: @ 830D9FC - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_CASTFORM - .2byte MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Auron:: @ 830DA0C - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MACHAMP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kelvin:: @ 830DA1C - .2byte 150 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SPHEAL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Marley:: @ 830DA2C - .2byte 255 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MANECTRIC - .2byte ITEM_NONE - .2byte MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT - - .align 2 -gTrainerParty_Reyna:: @ 830DA3C - .2byte 50 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Hudson:: @ 830DA4C - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Conor:: @ 830DA54 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_CHINCHOU - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Edwin1:: @ 830DA64 - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Hector:: @ 830DA74 - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_ZANGOOSE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SEVIPER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tabitha1:: @ 830DA84 - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_CAMERUPT - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_GOLBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Edwin2:: @ 830DA9C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Edwin3:: @ 830DAAC - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Edwin4:: @ 830DABC - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Edwin5:: @ 830DACC - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_LUDICOLO - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_SHIFTRY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wally1:: @ 830DADC - .2byte 150 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_ALTARIA - .2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_DELCATTY - .2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_ROSELIA - .2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_MAGNETON - .2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - .2byte 0 @ padding - - .2byte 250 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_GARDEVOIR - .2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan1:: @ 830DB2C - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_TREECKO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan2:: @ 830DB34 - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_GROVYLE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan3:: @ 830DB4C - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_GROVYLE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan4:: @ 830DB64 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_TORCHIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan5:: @ 830DB6C - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_COMBUSKEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan6:: @ 830DB84 - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_COMBUSKEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan7:: @ 830DB9C - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_MUDKIP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan8:: @ 830DBA4 - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_MARSHTOMP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan9:: @ 830DBBC - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MARSHTOMP - .2byte 0 @ padding - - .align 2 -gTrainerParty_May1:: @ 830DBD4 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_TREECKO - .2byte 0 @ padding - - .align 2 -gTrainerParty_May2:: @ 830DBDC - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_GROVYLE - .2byte 0 @ padding - - .align 2 -gTrainerParty_May3:: @ 830DBF4 - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_GROVYLE - .2byte 0 @ padding - - .align 2 -gTrainerParty_May4:: @ 830DC0C - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_TORCHIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_May5:: @ 830DC14 - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_COMBUSKEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_May6:: @ 830DC2C - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_COMBUSKEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_May7:: @ 830DC44 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_MUDKIP - .2byte 0 @ padding - - .align 2 -gTrainerParty_May8:: @ 830DC4C - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_MARSHTOMP - .2byte 0 @ padding - - .align 2 -gTrainerParty_May9:: @ 830DC64 - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MARSHTOMP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaac1:: @ 830DC7C - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_WHISMUR - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Davis:: @ 830DCAC - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_PINSIR - .2byte 0 @ padding - - .align 2 -gTrainerParty_Mitchell:: @ 830DCB4 - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_LUNATONE - .2byte MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SOLROCK - .2byte MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaac2:: @ 830DCD4 - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaac3:: @ 830DD04 - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaac4:: @ 830DD34 - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isaac5:: @ 830DD64 - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_LAIRON - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lydia1:: @ 830DD94 - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_SKITTY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 11 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Halle:: @ 830DDC4 - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SABLEYE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_ABSOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Garrison:: @ 830DDD4 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SANDSLASH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lydia2:: @ 830DDDC - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SKITTY - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lydia3:: @ 830DE0C - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_DELCATTY - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lydia4:: @ 830DE3C - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_DELCATTY - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lydia5:: @ 830DE6C - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_AZUMARILL - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_DELCATTY - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SEAKING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jackson1:: @ 830DE9C - .2byte 50 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lorenzo:: @ 830DEA4 - .2byte 50 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_SEEDOT - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sebastian:: @ 830DEBC - .2byte 50 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_CACTURNE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jackson2:: @ 830DEC4 - .2byte 60 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jackson3:: @ 830DECC - .2byte 70 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jackson4:: @ 830DED4 - .2byte 80 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jackson5:: @ 830DEDC - .2byte 90 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_KECLEON - .2byte 0 @ padding - - .2byte 90 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Catherine1:: @ 830DEEC - .2byte 50 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jenna:: @ 830DEFC - .2byte 50 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_LOTAD - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sophia:: @ 830DF14 - .2byte 50 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Catherine2:: @ 830DF24 - .2byte 60 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 60 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Catherine3:: @ 830DF34 - .2byte 70 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 70 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Catherine4:: @ 830DF44 - .2byte 80 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 80 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Catherine5:: @ 830DF54 - .2byte 90 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_BELLOSSOM - .2byte 0 @ padding - - .2byte 90 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Julio:: @ 830DF64 - .2byte 0 @ IV (0-255) - .2byte 21 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt27:: @ 830DF6C - .2byte 50 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_GOLBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt28:: @ 830DF7C - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt29:: @ 830DF8C - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt30:: @ 830DF9C - .2byte 50 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Marc:: @ 830DFAC - .2byte 120 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brenden:: @ 830DFBC - .2byte 100 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lilith:: @ 830DFC4 - .2byte 150 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cristian:: @ 830DFCC - .2byte 200 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sylvia:: @ 830DFD4 - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Leonardo:: @ 830DFDC - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Athena:: @ 830DFE4 - .2byte 100 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MANECTRIC - .2byte ITEM_NONE - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE - - .2byte 100 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LINOONE - .2byte ITEM_NONE - .2byte MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE - - .align 2 -gTrainerParty_Harrison:: @ 830E004 - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt31:: @ 830E00C - .2byte 0 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Clarence:: @ 830E014 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Terry:: @ 830E01C - .2byte 0 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_GIRAFARIG - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nate:: @ 830E024 - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_SPOINK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kathleen:: @ 830E02C - .2byte 100 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Clifford:: @ 830E034 - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_GIRAFARIG - .2byte 0 @ padding - - .align 2 -gTrainerParty_Nicholas:: @ 830E03C - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_WOBBUFFET - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt32:: @ 830E044 - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt33:: @ 830E054 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_BALTOY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt34:: @ 830E05C - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt35:: @ 830E064 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt36:: @ 830E06C - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_BALTOY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Macey:: @ 830E074 - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_NATU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan10:: @ 830E07C - .2byte 25 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_LOTAD - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_TORCHIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan11:: @ 830E08C - .2byte 25 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_TREECKO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Paxton:: @ 830E09C - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isabella:: @ 830E0AC - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt37:: @ 830E0B4 - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tabitha2:: @ 830E0C4 - .2byte 50 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jonathan:: @ 830E0E4 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_KECLEON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan12:: @ 830E0F4 - .2byte 25 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MUDKIP - .2byte 0 @ padding - - .align 2 -gTrainerParty_May10:: @ 830E104 - .2byte 25 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_TREECKO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Maxie1:: @ 830E114 - .2byte 150 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_CROBAT - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_CAMERUPT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Maxie2:: @ 830E12C - .2byte 150 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_CAMERUPT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tiana:: @ 830E144 - .2byte 0 @ IV (0-255) - .2byte 4 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 4 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Haley1:: @ 830E154 - .2byte 0 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_LOTAD - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Janice:: @ 830E164 - .2byte 0 @ IV (0-255) - .2byte 9 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Vivi:: @ 830E16C - .2byte 100 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Haley2:: @ 830E184 - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Haley3:: @ 830E194 - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Haley4:: @ 830E1A4 - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Haley5:: @ 830E1B4 - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_BRELOOM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sally:: @ 830E1CC - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_ODDISH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Robin:: @ 830E1D4 - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_SKITTY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Andrea:: @ 830E1EC - .2byte 100 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Crissy:: @ 830E1F4 - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Rick:: @ 830E204 - .2byte 0 @ IV (0-255) - .2byte 4 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 4 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lyle:: @ 830E214 - .2byte 0 @ IV (0-255) - .2byte 3 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 3 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 3 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 3 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jose:: @ 830E234 - .2byte 50 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_WURMPLE - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_NINCADA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Doug:: @ 830E244 - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_NINCADA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Greg:: @ 830E254 - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_VOLBEAT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_ILLUMISE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kent:: @ 830E264 - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .align 2 -gTrainerParty_James1:: @ 830E26C - .2byte 0 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_NINCADA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 6 @ level - .2byte SPECIES_NINCADA - .2byte 0 @ padding - - .align 2 -gTrainerParty_James2:: @ 830E27C - .2byte 10 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .align 2 -gTrainerParty_James3:: @ 830E284 - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_DUSTOX - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .align 2 -gTrainerParty_James4:: @ 830E294 - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_DUSTOX - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .align 2 -gTrainerParty_James5:: @ 830E2AC - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SURSKIT - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_DUSTOX - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brice:: @ 830E2CC - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Trent1:: @ 830E2DC - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lenny:: @ 830E2F4 - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lucas1:: @ 830E304 - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Alan:: @ 830E314 - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_NOSEPASS - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Clark:: @ 830E32C - .2byte 0 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Eric:: @ 830E334 - .2byte 0 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_BALTOY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lucas2:: @ 830E344 - .2byte 0 @ IV (0-255) - .2byte 9 @ level - .2byte SPECIES_WAILMER - .2byte MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Mike1:: @ 830E354 - .2byte 0 @ IV (0-255) - .2byte 10 @ level - .2byte SPECIES_PELIPPER - .2byte MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 10 @ level - .2byte SPECIES_POOCHYENA - .2byte MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Mike2:: @ 830E374 - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Trent2:: @ 830E38C - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Trent3:: @ 830E3AC - .2byte 20 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Trent4:: @ 830E3CC - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Trent5:: @ 830E3EC - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GOLEM - .2byte 0 @ padding - - .align 2 -gTrainerParty_DezAndLuke:: @ 830E40C - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_DELCATTY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_LeaAndJed:: @ 830E41C - .2byte 0 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .align 2 -gTrainerParty_KiraAndDan1:: @ 830E42C - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_VOLBEAT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_ILLUMISE - .2byte 0 @ padding - - .align 2 -gTrainerParty_KiraAndDan2:: @ 830E43C - .2byte 10 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_VOLBEAT - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_ILLUMISE - .2byte 0 @ padding - - .align 2 -gTrainerParty_KiraAndDan3:: @ 830E44C - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_VOLBEAT - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_ILLUMISE - .2byte 0 @ padding - - .align 2 -gTrainerParty_KiraAndDan4:: @ 830E45C - .2byte 30 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_VOLBEAT - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_ILLUMISE - .2byte 0 @ padding - - .align 2 -gTrainerParty_KiraAndDan5:: @ 830E46C - .2byte 40 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_VOLBEAT - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_ILLUMISE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Johanna:: @ 830E47C - .2byte 0 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Gerald:: @ 830E484 - .2byte 100 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_KECLEON - .2byte MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND - .2byte 0 @ padding - - .align 2 -gTrainerParty_Vivian:: @ 830E494 - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MEDITITE - .2byte MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MEDITITE - .2byte MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Danielle:: @ 830E4B4 - .2byte 100 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_MEDITITE - .2byte MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Hideo:: @ 830E4C4 - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Keigo:: @ 830E4E4 - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_NINJASK - .2byte MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Riley:: @ 830E504 - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_NINCADA - .2byte MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_KOFFING - .2byte MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Flint:: @ 830E524 - .2byte 150 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_XATU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ashley:: @ 830E534 - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_SWABLU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wally2:: @ 830E54C - .2byte 30 @ IV (0-255) - .2byte 16 @ level - .2byte SPECIES_RALTS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wally3:: @ 830E554 - .2byte 150 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_ALTARIA - .2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_DELCATTY - .2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_ROSELIA - .2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_MAGNETON - .2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - .2byte 0 @ padding - - .2byte 250 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_GARDEVOIR - .2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wally4:: @ 830E5A4 - .2byte 150 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_ALTARIA - .2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_DELCATTY - .2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_ROSELIA - .2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_MAGNETON - .2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - .2byte 0 @ padding - - .2byte 250 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_GARDEVOIR - .2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wally5:: @ 830E5F4 - .2byte 150 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_ALTARIA - .2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_DELCATTY - .2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_ROSELIA - .2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_MAGNETON - .2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - .2byte 0 @ padding - - .2byte 250 @ IV (0-255) - .2byte 54 @ level - .2byte SPECIES_GARDEVOIR - .2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wally6:: @ 830E644 - .2byte 150 @ IV (0-255) - .2byte 56 @ level - .2byte SPECIES_ALTARIA - .2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_DELCATTY - .2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 56 @ level - .2byte SPECIES_ROSELIA - .2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_MAGNETON - .2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - .2byte 0 @ padding - - .2byte 250 @ IV (0-255) - .2byte 57 @ level - .2byte SPECIES_GARDEVOIR - .2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan13:: @ 830E694 - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GROVYLE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan14:: @ 830E6B4 - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LUDICOLO - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_COMBUSKEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan15:: @ 830E6D4 - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LUDICOLO - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MARSHTOMP - .2byte 0 @ padding - - .align 2 -gTrainerParty_May11:: @ 830E6F4 - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GROVYLE - .2byte 0 @ padding - - .align 2 -gTrainerParty_May12:: @ 830E714 - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LUDICOLO - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_COMBUSKEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_May13:: @ 830E734 - .2byte 150 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_LUDICOLO - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MARSHTOMP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jonah:: @ 830E754 - .2byte 0 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Henry:: @ 830E76C - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Roger:: @ 830E77C - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_GYARADOS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Alexa:: @ 830E794 - .2byte 100 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_GLOOM - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_AZUMARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Ruben:: @ 830E7A4 - .2byte 100 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_SHIFTRY - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_NOSEPASS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Koji1:: @ 830E7B4 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wayne:: @ 830E7BC - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Aidan:: @ 830E7D4 - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SKARMORY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Reed:: @ 830E7E4 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SPHEAL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tisha:: @ 830E7F4 - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_CHINCHOU - .2byte 0 @ padding - - .align 2 -gTrainerParty_ToriAndTia:: @ 830E7FC - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_SPINDA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_SPINDA - .2byte 0 @ padding - - .align 2 -gTrainerParty_KimAndIris:: @ 830E80C - .2byte 0 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_SWABLU - .2byte MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_NUMEL - .2byte MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_TyraAndIvy:: @ 830E82C - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_ROSELIA - .2byte MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_GRAVELER - .2byte MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW - .2byte 0 @ padding - - .align 2 -gTrainerParty_MelAndPaul:: @ 830E84C - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_DUSTOX - .2byte MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_BEAUTIFLY - .2byte MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE - .2byte 0 @ padding - - .align 2 -gTrainerParty_JohnAndJay1:: @ 830E86C - .2byte 200 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MEDICHAM - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - .2byte 0 @ padding - - .2byte 200 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_JohnAndJay2:: @ 830E88C - .2byte 210 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MEDICHAM - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - .2byte 0 @ padding - - .2byte 210 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_JohnAndJay3:: @ 830E8AC - .2byte 220 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_MEDICHAM - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - .2byte 0 @ padding - - .2byte 220 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_JohnAndJay4:: @ 830E8CC - .2byte 230 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_MEDICHAM - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - .2byte 0 @ padding - - .2byte 230 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_JohnAndJay5:: @ 830E8EC - .2byte 240 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_MEDICHAM - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - .2byte 0 @ padding - - .2byte 240 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_HARIYAMA - .2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_ReliAndIan:: @ 830E90C - .2byte 0 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_AZUMARILL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .align 2 -gTrainerParty_LilaAndRoy1:: @ 830E91C - .2byte 0 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_CHINCHOU - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_LilaAndRoy2:: @ 830E92C - .2byte 0 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_CHINCHOU - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_LilaAndRoy3:: @ 830E93C - .2byte 0 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_LANTURN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_LilaAndRoy4:: @ 830E94C - .2byte 0 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_LANTURN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_LilaAndRoy5:: @ 830E95C - .2byte 0 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_LANTURN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_SHARPEDO - .2byte 0 @ padding - - .align 2 -gTrainerParty_LisaAndRay:: @ 830E96C - .2byte 0 @ IV (0-255) - .2byte 27 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Chris:: @ 830E97C - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 20 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_FEEBAS - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 23 @ level - .2byte SPECIES_CARVANHA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dawson:: @ 830E99C - .2byte 0 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_ZIGZAGOON - .2byte ITEM_NUGGET - - .2byte 0 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_POOCHYENA - .2byte ITEM_NONE - - .align 2 -gTrainerParty_Sarah:: @ 830E9AC - .2byte 0 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_LOTAD - .2byte ITEM_NONE - - .2byte 0 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_ZIGZAGOON - .2byte ITEM_NUGGET - - .align 2 -gTrainerParty_Darian:: @ 830E9BC - .2byte 0 @ IV (0-255) - .2byte 9 @ level - .2byte SPECIES_MAGIKARP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Hailey:: @ 830E9C4 - .2byte 0 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Chandler:: @ 830E9CC - .2byte 0 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 12 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kaleb:: @ 830E9DC - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_MINUN - .2byte ITEM_ORAN_BERRY - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_PLUSLE - .2byte ITEM_ORAN_BERRY - - .align 2 -gTrainerParty_Joseph:: @ 830E9EC - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_VOLTORB - .2byte 0 @ padding - - .align 2 -gTrainerParty_Alyssa:: @ 830E9FC - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MAGNEMITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Marcos:: @ 830EA04 - .2byte 100 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_VOLTORB - .2byte 0 @ padding - - .align 2 -gTrainerParty_Rhett:: @ 830EA0C - .2byte 100 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tyron:: @ 830EA14 - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Celina:: @ 830EA1C - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Bianca:: @ 830EA24 - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Hayden:: @ 830EA2C - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sophie:: @ 830EA34 - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Coby:: @ 830EA44 - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_SKARMORY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lawrence:: @ 830EA54 - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_BALTOY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Wyatt:: @ 830EA64 - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .align 2 -gTrainerParty_Angelina:: @ 830EA74 - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kai:: @ 830EA84 - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_BARBOACH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Charlotte:: @ 830EA8C - .2byte 0 @ IV (0-255) - .2byte 19 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Deandre:: @ 830EA94 - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_ARON - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 14 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt38:: @ 830EAAC - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt39:: @ 830EAB4 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt40:: @ 830EABC - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt41:: @ 830EAC4 - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_BALTOY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt42:: @ 830EAD4 - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_BALTOY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt43:: @ 830EAE4 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt44:: @ 830EAEC - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt45:: @ 830EAF4 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt46:: @ 830EAFC - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt47:: @ 830EB04 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt48:: @ 830EB0C - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_BALTOY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt49:: @ 830EB14 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt50:: @ 830EB1C - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt51:: @ 830EB24 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt52:: @ 830EB2C - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Grunt53:: @ 830EB34 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_BALTOY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tabitha3:: @ 830EB3C - .2byte 75 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 75 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 75 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_ZUBAT - .2byte 0 @ padding - - .2byte 75 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_CAMERUPT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Darcy:: @ 830EB5C - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_CAMERUPT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Maxie3:: @ 830EB6C - .2byte 150 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_CROBAT - .2byte 0 @ padding - - .2byte 150 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_CAMERUPT - .2byte 0 @ padding - - .align 2 -gTrainerParty_Pete:: @ 830EB84 - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Isabelle:: @ 830EB8C - .2byte 0 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Andres1:: @ 830EB94 - .2byte 50 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Josue:: @ 830EBA4 - .2byte 50 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Camron:: @ 830EBB4 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cory1:: @ 830EBBC - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Carolina:: @ 830EBD4 - .2byte 50 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 24 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Elijah:: @ 830EBEC - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SKARMORY - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SKARMORY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Celia:: @ 830EBFC - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Bryan:: @ 830EC0C - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_SANDSLASH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Branden:: @ 830EC1C - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 22 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .align 2 -gTrainerParty_Bryant:: @ 830EC2C - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Shayla:: @ 830EC3C - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Kyra:: @ 830EC4C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_DODRIO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Jaiden:: @ 830EC5C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_NINJASK - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_GULPIN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Alix:: @ 830EC6C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_KIRLIA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Helene:: @ 830EC7C - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Marlene:: @ 830EC8C - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 18 @ level - .2byte SPECIES_SPOINK - .2byte 0 @ padding - - .align 2 -gTrainerParty_Devan:: @ 830EC9C - .2byte 0 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Johnson:: @ 830ECAC - .2byte 0 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 8 @ level - .2byte SPECIES_LOTAD - .2byte 0 @ padding - - .align 2 -gTrainerParty_Melina:: @ 830ECBC - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_DODUO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brandi:: @ 830ECC4 - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_RALTS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Aisha:: @ 830ECCC - .2byte 0 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Makayla:: @ 830ECD4 - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_ROSELIA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MEDICHAM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Fabian:: @ 830ECE4 - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_Dayton:: @ 830ECEC - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SLUGMA - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Rachel:: @ 830ECFC - .2byte 0 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_GOLDEEN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Leonel:: @ 830ED04 - .2byte 100 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MANECTRIC - .2byte MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Callie:: @ 830ED14 - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MEDITITE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cale:: @ 830ED24 - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_DUSTOX - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_BEAUTIFLY - .2byte 0 @ padding - - .align 2 -gTrainerParty_Myles:: @ 830ED34 - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Pat:: @ 830ED64 - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_POOCHYENA - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SHROOMISH - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_MARILL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 25 @ level - .2byte SPECIES_GULPIN - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cristin1:: @ 830ED94 - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 29 @ level - .2byte SPECIES_VIGOROTH - .2byte 0 @ padding - - .align 2 -gTrainerParty_May14:: @ 830EDA4 - .2byte 25 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_LOTAD - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_TORCHIC - .2byte 0 @ padding - - .align 2 -gTrainerParty_May15:: @ 830EDB4 - .2byte 25 @ IV (0-255) - .2byte 13 @ level - .2byte SPECIES_TORKOAL - .2byte 0 @ padding - - .2byte 50 @ IV (0-255) - .2byte 15 @ level - .2byte SPECIES_MUDKIP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Roxanne2:: @ 830EDC4 - .2byte 255 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_GOLEM - .2byte ITEM_NONE - .2byte MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION - - .2byte 255 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_KABUTO - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_ONIX - .2byte ITEM_NONE - .2byte MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_NOSEPASS - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - - .align 2 -gTrainerParty_Roxanne3:: @ 830EE04 - .2byte 255 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_OMANYTE - .2byte ITEM_NONE - .2byte MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF - - .2byte 255 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_GOLEM - .2byte ITEM_NONE - .2byte MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION - - .2byte 255 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_KABUTOPS - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_ONIX - .2byte ITEM_NONE - .2byte MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_NOSEPASS - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - - .align 2 -gTrainerParty_Roxanne4:: @ 830EE54 - .2byte 255 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_OMASTAR - .2byte ITEM_NONE - .2byte MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF - - .2byte 255 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_GOLEM - .2byte ITEM_NONE - .2byte MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION - - .2byte 255 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_KABUTOPS - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_ONIX - .2byte ITEM_NONE - .2byte MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_NOSEPASS - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - - .align 2 -gTrainerParty_Roxanne5:: @ 830EEA4 - .2byte 255 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_AERODACTYL - .2byte ITEM_NONE - .2byte MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_GOLEM - .2byte ITEM_NONE - .2byte MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION - - .2byte 255 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_OMASTAR - .2byte ITEM_NONE - .2byte MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_KABUTOPS - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_STEELIX - .2byte ITEM_NONE - .2byte MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_NOSEPASS - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - - .align 2 -gTrainerParty_Brawly2:: @ 830EF04 - .2byte 255 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MACHAMP - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - - .2byte 255 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MEDITITE - .2byte ITEM_NONE - .2byte MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH - - .2byte 255 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_HITMONTOP - .2byte ITEM_NONE - .2byte MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - - .2byte 255 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_HARIYAMA - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - - .align 2 -gTrainerParty_Brawly3:: @ 830EF44 - .2byte 255 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_MACHAMP - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - - .2byte 255 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_MEDICHAM - .2byte ITEM_NONE - .2byte MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH - - .2byte 255 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_HITMONTOP - .2byte ITEM_NONE - .2byte MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - - .2byte 255 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_HARIYAMA - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - - .align 2 -gTrainerParty_Brawly4:: @ 830EF84 - .2byte 255 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_HITMONCHAN - .2byte ITEM_NONE - .2byte MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH - - .2byte 255 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MACHAMP - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - - .2byte 255 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MEDICHAM - .2byte ITEM_NONE - .2byte MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC - - .2byte 255 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_HITMONTOP - .2byte ITEM_NONE - .2byte MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - - .2byte 255 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_HARIYAMA - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - - .align 2 -gTrainerParty_Brawly5:: @ 830EFD4 - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_HITMONLEE - .2byte ITEM_NONE - .2byte MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP - - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_HITMONCHAN - .2byte ITEM_NONE - .2byte MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH - - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_MACHAMP - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_MEDICHAM - .2byte ITEM_NONE - .2byte MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_HITMONTOP - .2byte ITEM_NONE - .2byte MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - - .2byte 255 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_HARIYAMA - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - - .align 2 -gTrainerParty_Wattson2:: @ 830F034 - .2byte 255 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MAREEP - .2byte ITEM_NONE - .2byte MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - - .2byte 255 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_ELECTRODE - .2byte ITEM_NONE - .2byte MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - - .2byte 255 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_MAGNETON - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - - .2byte 255 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_MANECTRIC - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - - .align 2 -gTrainerParty_Wattson3:: @ 830F074 - .2byte 255 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_PIKACHU - .2byte ITEM_NONE - .2byte MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE - - .2byte 255 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_FLAAFFY - .2byte ITEM_NONE - .2byte MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - - .2byte 255 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_ELECTRODE - .2byte ITEM_NONE - .2byte MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - - .2byte 255 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MAGNETON - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - - .2byte 255 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_MANECTRIC - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - - .align 2 -gTrainerParty_Wattson4:: @ 830F0C4 - .2byte 255 @ IV (0-255) - .2byte 44 @ level - .2byte SPECIES_RAICHU - .2byte ITEM_NONE - .2byte MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_AMPHAROS - .2byte ITEM_NONE - .2byte MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_ELECTRODE - .2byte ITEM_NONE - .2byte MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_MAGNETON - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_MANECTRIC - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - - .align 2 -gTrainerParty_Wattson5:: @ 830F114 - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_ELECTABUZZ - .2byte ITEM_NONE - .2byte MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN - - .2byte 255 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_RAICHU - .2byte ITEM_NONE - .2byte MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_AMPHAROS - .2byte ITEM_NONE - .2byte MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_ELECTRODE - .2byte ITEM_NONE - .2byte MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_MAGNETON - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_MANECTRIC - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - - .align 2 -gTrainerParty_Flannery2:: @ 830F174 - .2byte 255 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_MAGCARGO - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_PONYTA - .2byte ITEM_NONE - .2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - - .2byte 255 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_CAMERUPT - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - - .2byte 255 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_TORKOAL - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - - .align 2 -gTrainerParty_Flannery3:: @ 830F1B4 - .2byte 255 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_GROWLITHE - .2byte ITEM_NONE - .2byte MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY - - .2byte 255 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MAGCARGO - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_PONYTA - .2byte ITEM_NONE - .2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - - .2byte 255 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_CAMERUPT - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - - .2byte 255 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_TORKOAL - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - - .align 2 -gTrainerParty_Flannery4:: @ 830F204 - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_HOUNDOUR - .2byte ITEM_NONE - .2byte MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY - - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_GROWLITHE - .2byte ITEM_NONE - .2byte MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR - - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_MAGCARGO - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_RAPIDASH - .2byte ITEM_NONE - .2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_CAMERUPT - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_TORKOAL - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - - .align 2 -gTrainerParty_Flannery5:: @ 830F264 - .2byte 255 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_ARCANINE - .2byte ITEM_NONE - .2byte MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_MAGCARGO - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - - .2byte 255 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_HOUNDOOM - .2byte ITEM_NONE - .2byte MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY - - .2byte 255 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_RAPIDASH - .2byte ITEM_NONE - .2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_CAMERUPT - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_TORKOAL - .2byte ITEM_WHITE_HERB - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - - .align 2 -gTrainerParty_Norman2:: @ 830F2C4 - .2byte 255 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_CHANSEY - .2byte ITEM_NONE - .2byte MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - - .2byte 255 @ IV (0-255) - .2byte 42 @ level - .2byte SPECIES_SLAKING - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - - .2byte 255 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SPINDA - .2byte ITEM_NONE - .2byte MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - - .2byte 255 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_SLAKING - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - - .align 2 -gTrainerParty_Norman3:: @ 830F304 - .2byte 255 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_SLAKING - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - - .2byte 255 @ IV (0-255) - .2byte 47 @ level - .2byte SPECIES_CHANSEY - .2byte ITEM_NONE - .2byte MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - - .2byte 255 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_KANGASKHAN - .2byte ITEM_NONE - .2byte MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL - - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_SPINDA - .2byte ITEM_NONE - .2byte MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_SLAKING - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - - .align 2 -gTrainerParty_Norman4:: @ 830F354 - .2byte 255 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_SLAKING - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - - .2byte 255 @ IV (0-255) - .2byte 52 @ level - .2byte SPECIES_BLISSEY - .2byte ITEM_NONE - .2byte MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_KANGASKHAN - .2byte ITEM_NONE - .2byte MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_SPINDA - .2byte ITEM_NONE - .2byte MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_SLAKING - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - - .align 2 -gTrainerParty_Norman5:: @ 830F3A4 - .2byte 255 @ IV (0-255) - .2byte 57 @ level - .2byte SPECIES_SLAKING - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - - .2byte 255 @ IV (0-255) - .2byte 57 @ level - .2byte SPECIES_BLISSEY - .2byte ITEM_NONE - .2byte MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_KANGASKHAN - .2byte ITEM_NONE - .2byte MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL - - .2byte 255 @ IV (0-255) - .2byte 57 @ level - .2byte SPECIES_TAUROS - .2byte ITEM_NONE - .2byte MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE - - .2byte 255 @ IV (0-255) - .2byte 58 @ level - .2byte SPECIES_SPINDA - .2byte ITEM_NONE - .2byte MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - - .2byte 255 @ IV (0-255) - .2byte 60 @ level - .2byte SPECIES_SLAKING - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - - .align 2 -gTrainerParty_Winona2:: @ 830F404 - .2byte 255 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_DRATINI - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM - - .2byte 255 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_TROPIUS - .2byte ITEM_NONE - .2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - - .2byte 255 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_PELIPPER - .2byte ITEM_NONE - .2byte MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - - .2byte 255 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_SKARMORY - .2byte ITEM_NONE - .2byte MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - - .2byte 255 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_ALTARIA - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - - .align 2 -gTrainerParty_Winona3:: @ 830F454 - .2byte 255 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_HOOTHOOT - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER - - .2byte 255 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_TROPIUS - .2byte ITEM_NONE - .2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - - .2byte 255 @ IV (0-255) - .2byte 45 @ level - .2byte SPECIES_DRAGONAIR - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM - - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_PELIPPER - .2byte ITEM_NONE - .2byte MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_SKARMORY - .2byte ITEM_NONE - .2byte MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_ALTARIA - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - - .align 2 -gTrainerParty_Winona4:: @ 830F4B4 - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_NOCTOWL - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER - - .2byte 255 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_TROPIUS - .2byte ITEM_NONE - .2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_DRAGONAIR - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM - - .2byte 255 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_PELIPPER - .2byte ITEM_NONE - .2byte MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_SKARMORY - .2byte ITEM_NONE - .2byte MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_ALTARIA - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - - .align 2 -gTrainerParty_Winona5:: @ 830F514 - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_NOCTOWL - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER - - .2byte 255 @ IV (0-255) - .2byte 54 @ level - .2byte SPECIES_TROPIUS - .2byte ITEM_NONE - .2byte MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_PELIPPER - .2byte ITEM_NONE - .2byte MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_DRAGONITE - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - - .2byte 255 @ IV (0-255) - .2byte 58 @ level - .2byte SPECIES_SKARMORY - .2byte ITEM_NONE - .2byte MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - - .2byte 255 @ IV (0-255) - .2byte 60 @ level - .2byte SPECIES_ALTARIA - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - - .align 2 -gTrainerParty_TateAndLiza2:: @ 830F574 - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_SLOWPOKE - .2byte ITEM_NONE - .2byte MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_CLAYDOL - .2byte ITEM_NONE - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - - .2byte 255 @ IV (0-255) - .2byte 49 @ level - .2byte SPECIES_XATU - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_LUNATONE - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_SOLROCK - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - - .align 2 -gTrainerParty_TateAndLiza3:: @ 830F5C4 - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_DROWZEE - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_SLOWPOKE - .2byte ITEM_NONE - .2byte MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 54 @ level - .2byte SPECIES_CLAYDOL - .2byte ITEM_NONE - .2byte MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - - .2byte 255 @ IV (0-255) - .2byte 54 @ level - .2byte SPECIES_XATU - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_LUNATONE - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - - .2byte 255 @ IV (0-255) - .2byte 55 @ level - .2byte SPECIES_SOLROCK - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - - .align 2 -gTrainerParty_TateAndLiza4:: @ 830F624 - .2byte 255 @ IV (0-255) - .2byte 58 @ level - .2byte SPECIES_HYPNO - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 59 @ level - .2byte SPECIES_CLAYDOL - .2byte ITEM_NONE - .2byte MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - - .2byte 255 @ IV (0-255) - .2byte 58 @ level - .2byte SPECIES_SLOWPOKE - .2byte ITEM_NONE - .2byte MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 59 @ level - .2byte SPECIES_XATU - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - - .2byte 255 @ IV (0-255) - .2byte 60 @ level - .2byte SPECIES_LUNATONE - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - - .2byte 255 @ IV (0-255) - .2byte 60 @ level - .2byte SPECIES_SOLROCK - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - - .align 2 -gTrainerParty_TateAndLiza5:: @ 830F684 - .2byte 255 @ IV (0-255) - .2byte 63 @ level - .2byte SPECIES_HYPNO - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 64 @ level - .2byte SPECIES_CLAYDOL - .2byte ITEM_NONE - .2byte MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - - .2byte 255 @ IV (0-255) - .2byte 63 @ level - .2byte SPECIES_SLOWKING - .2byte ITEM_NONE - .2byte MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - - .2byte 255 @ IV (0-255) - .2byte 64 @ level - .2byte SPECIES_XATU - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - - .2byte 255 @ IV (0-255) - .2byte 65 @ level - .2byte SPECIES_LUNATONE - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - - .2byte 255 @ IV (0-255) - .2byte 65 @ level - .2byte SPECIES_SOLROCK - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - - .align 2 -gTrainerParty_Juan2:: @ 830F6E4 - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_POLIWAG - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP - - .2byte 255 @ IV (0-255) - .2byte 46 @ level - .2byte SPECIES_WHISCASH - .2byte ITEM_NONE - .2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_WALREIN - .2byte ITEM_NONE - .2byte MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM - - .2byte 255 @ IV (0-255) - .2byte 48 @ level - .2byte SPECIES_CRAWDAUNT - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM - - .2byte 255 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_KINGDRA - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - - .align 2 -gTrainerParty_Juan3:: @ 830F734 - .2byte 255 @ IV (0-255) - .2byte 50 @ level - .2byte SPECIES_POLIWHIRL - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP - - .2byte 255 @ IV (0-255) - .2byte 51 @ level - .2byte SPECIES_WHISCASH - .2byte ITEM_NONE - .2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_WALREIN - .2byte ITEM_NONE - .2byte MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM - - .2byte 255 @ IV (0-255) - .2byte 53 @ level - .2byte SPECIES_CRAWDAUNT - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM - - .2byte 255 @ IV (0-255) - .2byte 56 @ level - .2byte SPECIES_KINGDRA - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - - .align 2 -gTrainerParty_Juan4:: @ 830F784 - .2byte 255 @ IV (0-255) - .2byte 56 @ level - .2byte SPECIES_LAPRAS - .2byte ITEM_NONE - .2byte MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY - - .2byte 255 @ IV (0-255) - .2byte 58 @ level - .2byte SPECIES_WHISCASH - .2byte ITEM_NONE - .2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - - .2byte 255 @ IV (0-255) - .2byte 56 @ level - .2byte SPECIES_POLIWHIRL - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP - - .2byte 255 @ IV (0-255) - .2byte 58 @ level - .2byte SPECIES_WALREIN - .2byte ITEM_NONE - .2byte MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM - - .2byte 255 @ IV (0-255) - .2byte 58 @ level - .2byte SPECIES_CRAWDAUNT - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM - - .2byte 255 @ IV (0-255) - .2byte 61 @ level - .2byte SPECIES_KINGDRA - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - - .align 2 -gTrainerParty_Juan5:: @ 830F7E4 - .2byte 255 @ IV (0-255) - .2byte 61 @ level - .2byte SPECIES_LAPRAS - .2byte ITEM_NONE - .2byte MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY - - .2byte 255 @ IV (0-255) - .2byte 63 @ level - .2byte SPECIES_WHISCASH - .2byte ITEM_NONE - .2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - - .2byte 255 @ IV (0-255) - .2byte 61 @ level - .2byte SPECIES_POLITOED - .2byte ITEM_NONE - .2byte MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG - - .2byte 255 @ IV (0-255) - .2byte 63 @ level - .2byte SPECIES_WALREIN - .2byte ITEM_NONE - .2byte MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD - - .2byte 255 @ IV (0-255) - .2byte 63 @ level - .2byte SPECIES_CRAWDAUNT - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM - - .2byte 255 @ IV (0-255) - .2byte 66 @ level - .2byte SPECIES_KINGDRA - .2byte ITEM_CHESTO_BERRY - .2byte MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - - .align 2 -gTrainerParty_Angelo:: @ 830F844 - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_ILLUMISE - .2byte ITEM_NONE - .2byte MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE - - .2byte 100 @ IV (0-255) - .2byte 17 @ level - .2byte SPECIES_VOLBEAT - .2byte ITEM_NONE - .2byte MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE - - .align 2 -gTrainerParty_Darius:: @ 830F864 - .2byte 200 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_TROPIUS - .2byte 0 @ padding - - .align 2 -gTrainerParty_Steven:: @ 830F86C - .2byte 255 @ IV (0-255) - .2byte 77 @ level - .2byte SPECIES_SKARMORY - .2byte ITEM_NONE - .2byte MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING - - .2byte 255 @ IV (0-255) - .2byte 75 @ level - .2byte SPECIES_CLAYDOL - .2byte ITEM_NONE - .2byte MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE - - .2byte 255 @ IV (0-255) - .2byte 76 @ level - .2byte SPECIES_AGGRON - .2byte ITEM_NONE - .2byte MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW - - .2byte 255 @ IV (0-255) - .2byte 76 @ level - .2byte SPECIES_CRADILY - .2byte ITEM_NONE - .2byte MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY - - .2byte 255 @ IV (0-255) - .2byte 76 @ level - .2byte SPECIES_ARMALDO - .2byte ITEM_NONE - .2byte MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH - - .2byte 255 @ IV (0-255) - .2byte 78 @ level - .2byte SPECIES_METAGROSS - .2byte ITEM_SITRUS_BERRY - .2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL - - .align 2 -gTrainerParty_Anabel:: @ 830F8CC - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_BELDUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Tucker:: @ 830F8D4 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_BELDUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Spenser:: @ 830F8DC - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_BELDUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Greta:: @ 830F8E4 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_BELDUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Noland:: @ 830F8EC - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_BELDUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Lucy:: @ 830F8F4 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_BELDUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brandon:: @ 830F8FC - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_BELDUM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Andres2:: @ 830F904 - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Andres3:: @ 830F914 - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_NOSEPASS - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Andres4:: @ 830F92C - .2byte 30 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_NOSEPASS - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_SANDSHREW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Andres5:: @ 830F944 - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_NOSEPASS - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_SANDSLASH - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_SANDSLASH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cory2:: @ 830F95C - .2byte 10 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cory3:: @ 830F974 - .2byte 20 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 32 @ level - .2byte SPECIES_TENTACOOL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cory4:: @ 830F98C - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cory5:: @ 830F9A4 - .2byte 40 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_TENTACRUEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Pablo2:: @ 830F9BC - .2byte 10 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Pablo3:: @ 830F9CC - .2byte 20 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_WINGULL - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Pablo4:: @ 830F9E4 - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_STARYU - .2byte 0 @ padding - - .align 2 -gTrainerParty_Pablo5:: @ 830F9FC - .2byte 40 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_PELIPPER - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_STARMIE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_STARMIE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Koji2:: @ 830FA14 - .2byte 10 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Koji3:: @ 830FA24 - .2byte 20 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MAKUHITA - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Koji4:: @ 830FA3C - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .align 2 -gTrainerParty_Koji5:: @ 830FA54 - .2byte 40 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_HARIYAMA - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MACHAMP - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 43 @ level - .2byte SPECIES_MACHAMP - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cristin2:: @ 830FA6C - .2byte 110 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 110 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_VIGOROTH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cristin3:: @ 830FA7C - .2byte 120 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_SPINDA - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 120 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_VIGOROTH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cristin4:: @ 830FA94 - .2byte 130 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_SPINDA - .2byte 0 @ padding - - .2byte 130 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .2byte 100 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_VIGOROTH - .2byte 0 @ padding - - .align 2 -gTrainerParty_Cristin5:: @ 830FAAC - .2byte 140 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_SPINDA - .2byte 0 @ padding - - .2byte 140 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_EXPLOUD - .2byte 0 @ padding - - .2byte 140 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_SLAKING - .2byte 0 @ padding - - .align 2 -gTrainerParty_Fernando2:: @ 830FAC4 - .2byte 10 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_Fernando3:: @ 830FADC - .2byte 20 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_ELECTRIKE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_Fernando4:: @ 830FAF4 - .2byte 30 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 39 @ level - .2byte SPECIES_LOUDRED - .2byte 0 @ padding - - .align 2 -gTrainerParty_Fernando5:: @ 830FB0C - .2byte 40 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_MANECTRIC - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_EXPLOUD - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sawyer2:: @ 830FB24 - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_GEODUDE - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 26 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sawyer3:: @ 830FB34 - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 28 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sawyer4:: @ 830FB4C - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_MACHOP - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_NUMEL - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 30 @ level - .2byte SPECIES_GRAVELER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Sawyer5:: @ 830FB64 - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MACHOKE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_CAMERUPT - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_GOLEM - .2byte 0 @ padding - - .align 2 -gTrainerParty_Gabrielle2:: @ 830FB7C - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SKITTY - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_ZIGZAGOON - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_LOTAD - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_SEEDOT - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 31 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Gabrielle3:: @ 830FBAC - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_SKITTY - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 33 @ level - .2byte SPECIES_TAILLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Gabrielle4:: @ 830FBDC - .2byte 30 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_DELCATTY - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_LOMBRE - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_NUZLEAF - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 35 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Gabrielle5:: @ 830FC0C - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_DELCATTY - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_MIGHTYENA - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_LINOONE - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_LUDICOLO - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_SHIFTRY - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 37 @ level - .2byte SPECIES_SWELLOW - .2byte 0 @ padding - - .align 2 -gTrainerParty_Thalia2:: @ 830FC3C - .2byte 10 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 10 @ IV (0-255) - .2byte 34 @ level - .2byte SPECIES_HORSEA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Thalia3:: @ 830FC4C - .2byte 20 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 20 @ IV (0-255) - .2byte 36 @ level - .2byte SPECIES_SEADRA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Thalia4:: @ 830FC64 - .2byte 30 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_WAILMER - .2byte 0 @ padding - - .2byte 30 @ IV (0-255) - .2byte 38 @ level - .2byte SPECIES_SEADRA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Thalia5:: @ 830FC7C - .2byte 40 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_LUVDISC - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_WAILORD - .2byte 0 @ padding - - .2byte 40 @ IV (0-255) - .2byte 40 @ level - .2byte SPECIES_KINGDRA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Mariela:: @ 830FC94 - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_CHIMECHO - .2byte 0 @ padding - - .align 2 -gTrainerParty_Alvaro:: @ 830FC9C - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_BANETTE - .2byte 0 @ padding - - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_KADABRA - .2byte 0 @ padding - - .align 2 -gTrainerParty_Everett:: @ 830FCAC - .2byte 0 @ IV (0-255) - .2byte 41 @ level - .2byte SPECIES_WOBBUFFET - .2byte 0 @ padding - - .align 2 -gTrainerParty_Red:: @ 830FCB4 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_CHARMANDER - .2byte 0 @ padding - - .align 2 -gTrainerParty_Leaf:: @ 830FCBC - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_BULBASAUR - .2byte 0 @ padding - - .align 2 -gTrainerParty_Brendan16:: @ 830FCC4 - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_GROUDON - .2byte 0 @ padding - - .align 2 -gTrainerParty_May16:: @ 830FCCC - .2byte 0 @ IV (0-255) - .2byte 5 @ level - .2byte SPECIES_KYOGRE - .2byte 0 @ padding diff --git a/data/trainers.inc b/data/trainers.inc deleted file mode 100644 index b401c2a77..000000000 --- a/data/trainers.inc +++ /dev/null @@ -1,10261 +0,0 @@ - .align 2 -gTrainers:: @ 8310030 -@ NONE - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 0 @ party size - .4byte NULL - -@ SAWYER_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "SAWYER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Sawyer1 - -@ GRUNT_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt1 - -@ GRUNT_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt2 - -@ GRUNT_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt3 - -@ GRUNT_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt4 - -@ GRUNT_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt5 - -@ GRUNT_6 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt6 - -@ GRUNT_7 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt7 - -@ GABRIELLE_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "GABRIELLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Gabrielle1 - -@ GRUNT_8 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt8 - -@ MARCEL - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "MARCEL$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Marcel - -@ ALBERTO - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "ALBERTO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Alberto - -@ ED - .byte 0 @ party type flags - .byte TRAINER_CLASS_COLLECTOR - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_COLLECTOR - .string "ED$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Ed - -@ GRUNT_9 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt9 - -@ DECLAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "DECLAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Declan - -@ GRUNT_10 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt10 - -@ GRUNT_11 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt11 - -@ GRUNT_12 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt12 - -@ GRUNT_13 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Grunt13 - -@ GRUNT_14 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt14 - -@ GRUNT_15 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt15 - -@ GRUNT_16 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt16 - -@ GRUNT_17 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt17 - -@ GRUNT_18 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt18 - -@ GRUNT_19 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt19 - -@ GRUNT_20 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt20 - -@ GRUNT_21 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt21 - -@ GRUNT_22 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt22 - -@ FREDRICK - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_M - .string "FREDRICK$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Fredrick - -@ MATT - .byte 0 @ party type flags - .byte TRAINER_CLASS_AQUA_ADMIN - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_ADMIN_M - .string "MATT$", 12 - .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Matt - -@ ZANDER - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "ZANDER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Zander - -@ SHELLY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_AQUA_ADMIN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_ADMIN_F - .string "SHELLY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shelly1 - -@ SHELLY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_AQUA_ADMIN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_ADMIN_F - .string "SHELLY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shelly2 - -@ ARCHIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_AQUA_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_LEADER_ARCHIE - .string "ARCHIE$", 12 - .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Archie - -@ LEAH - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "LEAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Leah - -@ DAISY - .byte 0 @ party type flags - .byte TRAINER_CLASS_AROMA_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_AROMA_LADY - .string "DAISY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Daisy - -@ ROSE_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_AROMA_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Rose1 - -@ FELIX - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "FELIX$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Felix - -@ VIOLET - .byte 0 @ party type flags - .byte TRAINER_CLASS_AROMA_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_AROMA_LADY - .string "VIOLET$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Violet - -@ ROSE_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_AROMA_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Rose2 - -@ ROSE_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_AROMA_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Rose3 - -@ ROSE_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_AROMA_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Rose4 - -@ ROSE_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_AROMA_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Rose5 - -@ DUSTY_1 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dusty1 - -@ CHIP - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "CHIP$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Chip - -@ FOSTER - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "FOSTER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Foster - -@ DUSTY_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dusty2 - -@ DUSTY_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dusty3 - -@ DUSTY_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dusty4 - -@ DUSTY_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dusty5 - -@ GABBY_AND_TY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_INTERVIEWER - .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music - .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_GabbyAndTy1 - -@ GABBY_AND_TY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_INTERVIEWER - .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music - .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_GabbyAndTy2 - -@ GABBY_AND_TY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_INTERVIEWER - .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music - .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_GabbyAndTy3 - -@ GABBY_AND_TY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_INTERVIEWER - .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music - .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_GabbyAndTy4 - -@ GABBY_AND_TY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_INTERVIEWER - .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music - .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_GabbyAndTy5 - -@ GABBY_AND_TY_6 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_INTERVIEWER - .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music - .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_GabbyAndTy6 - -@ LOLA_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_F - .string "LOLA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Lola1 - -@ AUSTINA - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_F - .string "AUSTINA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Austina - -@ GWEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_F - .string "GWEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Gwen - -@ LOLA_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_F - .string "LOLA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Lola2 - -@ LOLA_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_F - .string "LOLA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Lola3 - -@ LOLA_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_F - .string "LOLA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Lola4 - -@ LOLA_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_F - .string "LOLA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Lola5 - -@ RICKY_1 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_TUBER_2 - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Ricky1 - -@ SIMON - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_2 - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_M - .string "SIMON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Simon - -@ CHARLIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_2 - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_M - .string "CHARLIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Charlie - -@ RICKY_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_TUBER_2 - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Ricky2 - -@ RICKY_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_TUBER_2 - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Ricky3 - -@ RICKY_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_TUBER_2 - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Ricky4 - -@ RICKY_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_TUBER_2 - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Ricky5 - -@ RANDALL - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "RANDALL$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Randall - -@ PARKER - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "PARKER$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Parker - -@ GEORGE - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "GEORGE$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_George - -@ BERKE - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "BERKE$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Berke - -@ BRAXTON - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "BRAXTON$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Braxton - -@ VINCENT - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "VINCENT$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Vincent - -@ LEROY - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "LEROY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Leroy - -@ WILTON_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 - .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Wilton1 - -@ EDGAR - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "EDGAR$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Edgar - -@ ALBERT - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "ALBERT$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Albert - -@ SAMUEL - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "SAMUEL$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Samuel - -@ VITO - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "VITO$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Vito - -@ OWEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "OWEN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Owen - -@ WILTON_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Wilton2 - -@ WILTON_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Wilton3 - -@ WILTON_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Wilton4 - -@ WILTON_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Wilton5 - -@ WARREN - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "WARREN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Warren - -@ MARY - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "MARY$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Mary - -@ ALEXIA - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "ALEXIA$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Alexia - -@ JODY - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "JODY$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jody - -@ WENDY - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "WENDY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Wendy - -@ KEIRA - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "KEIRA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Keira - -@ BROOKE_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 - .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brooke1 - -@ JENNIFER - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "JENNIFER$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jennifer - -@ HOPE - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "HOPE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Hope - -@ SHANNON - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "SHANNON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Shannon - -@ MICHELLE - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "MICHELLE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Michelle - -@ CAROLINE - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "CAROLINE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Caroline - -@ JULIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "JULIE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Julie - -@ BROOKE_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brooke2 - -@ BROOKE_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brooke3 - -@ BROOKE_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brooke4 - -@ BROOKE_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brooke5 - -@ PATRICIA - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "PATRICIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Patricia - -@ KINDRA - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "KINDRA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Kindra - -@ TAMMY - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "TAMMY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Tammy - -@ VALERIE_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Valerie1 - -@ TASHA - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "TASHA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Tasha - -@ VALERIE_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Valerie2 - -@ VALERIE_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Valerie3 - -@ VALERIE_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Valerie4 - -@ VALERIE_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Valerie5 - -@ CINDY_1 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "CINDY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cindy1 - -@ DAPHNE - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "DAPHNE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Daphne - -@ GRUNT_23 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Grunt23 - -@ CINDY_2 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "CINDY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cindy2 - -@ BRIANNA - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "BRIANNA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brianna - -@ NAOMI - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "NAOMI$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Naomi - -@ CINDY_3 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "CINDY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cindy3 - -@ CINDY_4 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "CINDY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cindy4 - -@ CINDY_5 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "CINDY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cindy5 - -@ CINDY_6 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "CINDY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cindy6 - -@ MELISSA - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "MELISSA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Melissa - -@ SHEILA - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "SHEILA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Sheila - -@ SHIRLEY - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "SHIRLEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Shirley - -@ JESSICA_1 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jessica1 - -@ CONNIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "CONNIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Connie - -@ BRIDGET - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "BRIDGET$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Bridget - -@ OLIVIA - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "OLIVIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Olivia - -@ TIFFANY - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "TIFFANY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Tiffany - -@ JESSICA_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jessica2 - -@ JESSICA_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jessica3 - -@ JESSICA_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jessica4 - -@ JESSICA_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jessica5 - -@ WINSTON_1 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_RICH_BOY - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Winston1 - -@ MOLLIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_F - .string "MOLLIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Mollie - -@ GARRET - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_RICH_BOY - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_RICH_BOY - .string "GARRET$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Garret - -@ WINSTON_2 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_RICH_BOY - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Winston2 - -@ WINSTON_3 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_RICH_BOY - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Winston3 - -@ WINSTON_4 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_RICH_BOY - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Winston4 - -@ WINSTON_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_RICH_BOY - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Winston5 - -@ STEVE_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_POKEMANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Steve1 - -@ THALIA_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "THALIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Thalia1 - -@ MARK - .byte 0 @ party type flags - .byte TRAINER_CLASS_POKEMANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_POKEMANIAC - .string "MARK$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Mark - -@ GRUNT_24 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt24 - -@ STEVE_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_POKEMANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Steve2 - -@ STEVE_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_POKEMANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Steve3 - -@ STEVE_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_POKEMANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Steve4 - -@ STEVE_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_POKEMANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Steve5 - -@ LUIS - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "LUIS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Luis - -@ DOMINIK - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "DOMINIK$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dominik - -@ DOUGLAS - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "DOUGLAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Douglas - -@ DARRIN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "DARRIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Darrin - -@ TONY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Tony1 - -@ JEROME - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "JEROME$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jerome - -@ MATTHEW - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "MATTHEW$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Matthew - -@ DAVID - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "DAVID$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_David - -@ SPENCER - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "SPENCER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Spencer - -@ ROLAND - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "ROLAND$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Roland - -@ NOLEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "NOLEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Nolen - -@ STAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "STAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Stan - -@ BARRY - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "BARRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Barry - -@ DEAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "DEAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Dean - -@ RODNEY - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "RODNEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Rodney - -@ RICHARD - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "RICHARD$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Richard - -@ HERMAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "HERMAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Herman - -@ SANTIAGO - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "SANTIAGO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Santiago - -@ GILBERT - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "GILBERT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Gilbert - -@ FRANKLIN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "FRANKLIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Franklin - -@ KEVIN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "KEVIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Kevin - -@ JACK - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "JACK$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jack - -@ DUDLEY - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "DUDLEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Dudley - -@ CHAD - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "CHAD$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Chad - -@ TONY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Tony2 - -@ TONY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Tony3 - -@ TONY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Tony4 - -@ TONY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Tony5 - -@ TAKAO - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "TAKAO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Takao - -@ HITOSHI - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "HITOSHI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Hitoshi - -@ KIYO - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "KIYO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Kiyo - -@ KOICHI - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "KOICHI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Koichi - -@ NOB_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Nob1 - -@ NOB_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Nob2 - -@ NOB_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Nob3 - -@ NOB_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Nob4 - -@ NOB_5 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Nob5 - -@ YUJI - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "YUJI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Yuji - -@ DAISUKE - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "DAISUKE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Daisuke - -@ ATSUSHI - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "ATSUSHI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Atsushi - -@ KIRK - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "KIRK$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Kirk - -@ GRUNT_25 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt25 - -@ GRUNT_26 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt26 - -@ SHAWN - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "SHAWN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shawn - -@ FERNANDO_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "FERNANDO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Fernando1 - -@ DALTON_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Dalton1 - -@ DALTON_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Dalton2 - -@ DALTON_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Dalton3 - -@ DALTON_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Dalton4 - -@ DALTON_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Dalton5 - -@ COLE - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "COLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cole - -@ JEFF - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "JEFF$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jeff - -@ AXLE - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "AXLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Axle - -@ JACE - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "JACE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jace - -@ KEEGAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "KEEGAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Keegan - -@ BERNIE_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Bernie1 - -@ BERNIE_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Bernie2 - -@ BERNIE_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Bernie3 - -@ BERNIE_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Bernie4 - -@ BERNIE_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Bernie5 - -@ DREW - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "DREW$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Drew - -@ BEAU - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "BEAU$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Beau - -@ LARRY - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "LARRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Larry - -@ SHANE - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "SHANE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shane - -@ JUSTIN - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "JUSTIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Justin - -@ ETHAN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Ethan1 - -@ AUTUMN - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "AUTUMN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Autumn - -@ TRAVIS - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "TRAVIS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Travis - -@ ETHAN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Ethan2 - -@ ETHAN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Ethan3 - -@ ETHAN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Ethan4 - -@ ETHAN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Ethan5 - -@ BRENT - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "BRENT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brent - -@ DONALD - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "DONALD$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Donald - -@ TAYLOR - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "TAYLOR$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Taylor - -@ JEFFREY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "JEFFREY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jeffrey1 - -@ DEREK - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "DEREK$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Derek - -@ JEFFREY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "JEFFREY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jeffrey2 - -@ JEFFREY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "JEFFREY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jeffrey3 - -@ JEFFREY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "JEFFREY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Jeffrey4 - -@ JEFFREY_5 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "JEFFREY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Jeffrey5 - -@ EDWARD - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "EDWARD$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Edward - -@ PRESTON - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "PRESTON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Preston - -@ VIRGIL - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "VIRGIL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Virgil - -@ BLAKE - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "BLAKE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Blake - -@ WILLIAM - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "WILLIAM$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_William - -@ JOSHUA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "JOSHUA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Joshua - -@ CAMERON_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cameron1 - -@ CAMERON_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cameron2 - -@ CAMERON_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cameron3 - -@ CAMERON_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cameron4 - -@ CAMERON_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cameron5 - -@ JACLYN - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "JACLYN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jaclyn - -@ HANNAH - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "HANNAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Hannah - -@ SAMANTHA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "SAMANTHA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Samantha - -@ MAURA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "MAURA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Maura - -@ KAYLA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "KAYLA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Kayla - -@ ALEXIS - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "ALEXIS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Alexis - -@ JACKI_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jacki1 - -@ JACKI_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jacki2 - -@ JACKI_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jacki3 - -@ JACKI_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jacki4 - -@ JACKI_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jacki5 - -@ WALTER_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Walter1 - -@ MICAH - .byte 0 @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "MICAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Micah - -@ THOMAS - .byte 0 @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "THOMAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Thomas - -@ WALTER_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Walter2 - -@ WALTER_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Walter3 - -@ WALTER_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Walter4 - -@ WALTER_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Walter5 - -@ SIDNEY - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_ELITE_FOUR - .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music - .byte TRAINER_PIC_ELITE_FOUR_SIDNEY - .string "SIDNEY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xf @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Sidney - -@ PHOEBE - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_ELITE_FOUR - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music - .byte TRAINER_PIC_ELITE_FOUR_PHOEBE - .string "PHOEBE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Phoebe - -@ GLACIA - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_ELITE_FOUR - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music - .byte TRAINER_PIC_ELITE_FOUR_GLACIA - .string "GLACIA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Glacia - -@ DRAKE - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_ELITE_FOUR - .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music - .byte TRAINER_PIC_ELITE_FOUR_DRAKE - .string "DRAKE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Drake - -@ ROXANNE_1 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_ROXANNE - .string "ROXANNE$", 12 - .2byte ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Roxanne1 - -@ BRAWLY_1 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_BRAWLY - .string "BRAWLY$", 12 - .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brawly1 - -@ WATTSON_1 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WATTSON - .string "WATTSON$", 12 - .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Wattson1 - -@ FLANNERY_1 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_FLANNERY - .string "FLANNERY$", 12 - .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Flannery1 - -@ NORMAN_1 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_NORMAN - .string "NORMAN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Norman1 - -@ WINONA_1 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WINONA - .string "WINONA$", 12 - .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x17 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Winona1 - -@ TATE_AND_LIZA_1 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_TATE_AND_LIZA - .string "TATE&LIZA$", 12 - .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_TateAndLiza1 - -@ JUAN_1 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_JUAN - .string "JUAN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Juan1 - -@ JERRY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jerry1 - -@ TED - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_M - .string "TED$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Ted - -@ PAUL - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_M - .string "PAUL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Paul - -@ JERRY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jerry2 - -@ JERRY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jerry3 - -@ JERRY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jerry4 - -@ JERRY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jerry5 - -@ KAREN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Karen1 - -@ GEORGIA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_F - .string "GEORGIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Georgia - -@ KAREN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Karen2 - -@ KAREN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Karen3 - -@ KAREN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Karen4 - -@ KAREN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SCHOOL_KID - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Karen5 - -@ KATE_AND_JOY - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_SR_AND_JR - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_SR_AND_JR - .string "KATE & JOY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_KateAndJoy - -@ ANNA_AND_MEG_1 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_SR_AND_JR - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AnnaAndMeg1 - -@ ANNA_AND_MEG_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_SR_AND_JR - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AnnaAndMeg2 - -@ ANNA_AND_MEG_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_SR_AND_JR - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AnnaAndMeg3 - -@ ANNA_AND_MEG_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_SR_AND_JR - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AnnaAndMeg4 - -@ ANNA_AND_MEG_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_SR_AND_JR - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AnnaAndMeg5 - -@ VICTOR - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_WINSTRATE - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_M - .string "VICTOR$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Victor - -@ MIGUEL_1 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_M - .string "MIGUEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Miguel1 - -@ COLTON - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_M - .string "COLTON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Colton - -@ MIGUEL_2 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_M - .string "MIGUEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Miguel2 - -@ MIGUEL_3 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_M - .string "MIGUEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Miguel3 - -@ MIGUEL_4 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_M - .string "MIGUEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Miguel4 - -@ MIGUEL_5 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_M - .string "MIGUEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Miguel5 - -@ VICTORIA - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_WINSTRATE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_F - .string "VICTORIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x3 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Victoria - -@ VANESSA - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_F - .string "VANESSA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Vanessa - -@ BETHANY - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_F - .string "BETHANY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Bethany - -@ ISABEL_1 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_F - .string "ISABEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Isabel1 - -@ ISABEL_2 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_F - .string "ISABEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Isabel2 - -@ ISABEL_3 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_F - .string "ISABEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Isabel3 - -@ ISABEL_4 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_F - .string "ISABEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Isabel4 - -@ ISABEL_5 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_F - .string "ISABEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Isabel5 - -@ TIMOTHY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Timothy1 - -@ TIMOTHY_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Timothy2 - -@ TIMOTHY_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Timothy3 - -@ TIMOTHY_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Timothy4 - -@ TIMOTHY_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Timothy5 - -@ VICKY - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_WINSTRATE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_F - .string "VICKY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Vicky - -@ SHELBY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shelby1 - -@ SHELBY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shelby2 - -@ SHELBY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shelby3 - -@ SHELBY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shelby4 - -@ SHELBY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shelby5 - -@ CALVIN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Calvin1 - -@ BILLY - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "BILLY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Billy - -@ JOSH - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "JOSH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Josh - -@ TOMMY - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "TOMMY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Tommy - -@ JOEY - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "JOEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Joey - -@ BEN - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "BEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Ben - -@ QUINCY - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "QUINCY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Quincy - -@ KATELYNN - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "KATELYNN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Katelynn - -@ JAYLEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "JAYLEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jaylen - -@ DILLON - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "DILLON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dillon - -@ CALVIN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Calvin2 - -@ CALVIN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Calvin3 - -@ CALVIN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Calvin4 - -@ CALVIN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Calvin5 - -@ EDDIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "EDDIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Eddie - -@ ALLEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "ALLEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Allen - -@ TIMMY - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "TIMMY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Timmy - -@ WALLACE - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_CHAMPION - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CHAMPION_WALLACE - .string "WALLACE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Wallace - -@ ANDREW - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "ANDREW$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Andrew - -@ IVAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "IVAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Ivan - -@ CLAUDE - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "CLAUDE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Claude - -@ ELLIOT_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Elliot1 - -@ NED - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "NED$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Ned - -@ DALE - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "DALE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Dale - -@ NOLAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "NOLAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Nolan - -@ BARNY - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "BARNY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Barny - -@ WADE - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "WADE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Wade - -@ CARTER - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "CARTER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Carter - -@ ELLIOT_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Elliot2 - -@ ELLIOT_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Elliot3 - -@ ELLIOT_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Elliot4 - -@ ELLIOT_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x3 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Elliot5 - -@ RONALD - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "RONALD$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Ronald - -@ JACOB - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "JACOB$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jacob - -@ ANTHONY - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "ANTHONY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Anthony - -@ BENJAMIN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Benjamin1 - -@ BENJAMIN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Benjamin2 - -@ BENJAMIN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Benjamin3 - -@ BENJAMIN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Benjamin4 - -@ BENJAMIN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Benjamin5 - -@ ABIGAIL_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Abigail1 - -@ JASMINE - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "JASMINE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jasmine - -@ ABIGAIL_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Abigail2 - -@ ABIGAIL_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Abigail3 - -@ ABIGAIL_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Abigail4 - -@ ABIGAIL_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Abigail5 - -@ DYLAN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dylan1 - -@ DYLAN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dylan2 - -@ DYLAN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dylan3 - -@ DYLAN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dylan4 - -@ DYLAN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dylan5 - -@ MARIA_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Maria1 - -@ MARIA_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Maria2 - -@ MARIA_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Maria3 - -@ MARIA_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Maria4 - -@ MARIA_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Maria5 - -@ CAMDEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "CAMDEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Camden - -@ DEMETRIUS - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "DEMETRIUS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Demetrius - -@ ISAIAH_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Isaiah1 - -@ PABLO_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "PABLO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Pablo1 - -@ CHASE - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "CHASE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Chase - -@ ISAIAH_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Isaiah2 - -@ ISAIAH_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Isaiah3 - -@ ISAIAH_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Isaiah4 - -@ ISAIAH_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Isaiah5 - -@ ISOBEL - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "ISOBEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Isobel - -@ DONNY - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "DONNY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Donny - -@ TALIA - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "TALIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Talia - -@ KATELYN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Katelyn1 - -@ ALLISON - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "ALLISON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Allison - -@ KATELYN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Katelyn2 - -@ KATELYN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Katelyn3 - -@ KATELYN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Katelyn4 - -@ KATELYN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Katelyn5 - -@ NICOLAS_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_DRAGON_TAMER - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Nicolas1 - -@ NICOLAS_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_DRAGON_TAMER - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Nicolas2 - -@ NICOLAS_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_DRAGON_TAMER - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Nicolas3 - -@ NICOLAS_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_DRAGON_TAMER - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Nicolas4 - -@ NICOLAS_5 - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_DRAGON_TAMER - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Nicolas5 - -@ AARON - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_DRAGON_TAMER - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_DRAGON_TAMER - .string "AARON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Aaron - -@ PERRY - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "PERRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Perry - -@ HUGH - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "HUGH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Hugh - -@ PHIL - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "PHIL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Phil - -@ JARED - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "JARED$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jared - -@ HUMBERTO - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "HUMBERTO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Humberto - -@ PRESLEY - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "PRESLEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Presley - -@ EDWARDO - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "EDWARDO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Edwardo - -@ COLIN - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "COLIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Colin - -@ ROBERT_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Robert1 - -@ BENNY - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "BENNY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Benny - -@ CHESTER - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "CHESTER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Chester - -@ ROBERT_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Robert2 - -@ ROBERT_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Robert3 - -@ ROBERT_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Robert4 - -@ ROBERT_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Robert5 - -@ ALEX - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "ALEX$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Alex - -@ BECK - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "BECK$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Beck - -@ YASU - .byte 0 @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "YASU$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x3 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Yasu - -@ TAKASHI - .byte 0 @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "TAKASHI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x3 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Takashi - -@ DIANNE - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "DIANNE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Dianne - -@ JANI - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_F - .string "JANI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jani - -@ LAO_1 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Lao1 - -@ LUNG - .byte 0 @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "LUNG$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Lung - -@ LAO_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Lao2 - -@ LAO_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Lao3 - -@ LAO_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Lao4 - -@ LAO_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Lao5 - -@ JOCELYN - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "JOCELYN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jocelyn - -@ LAURA - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "LAURA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Laura - -@ CYNDY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cyndy1 - -@ CORA - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "CORA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cora - -@ PAULA - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "PAULA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Paula - -@ CYNDY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cyndy2 - -@ CYNDY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cyndy3 - -@ CYNDY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cyndy4 - -@ CYNDY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cyndy5 - -@ MADELINE_1 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PARASOL_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Madeline1 - -@ CLARISSA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PARASOL_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_PARASOL_LADY - .string "CLARISSA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Clarissa - -@ ANGELICA - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PARASOL_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_PARASOL_LADY - .string "ANGELICA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Angelica - -@ MADELINE_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PARASOL_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Madeline2 - -@ MADELINE_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PARASOL_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Madeline3 - -@ MADELINE_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PARASOL_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Madeline4 - -@ MADELINE_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PARASOL_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Madeline5 - -@ BEVERLY - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "BEVERLY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Beverly - -@ IMANI - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "IMANI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Imani - -@ KYLA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "KYLA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Kyla - -@ DENISE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "DENISE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Denise - -@ BETH - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "BETH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Beth - -@ TARA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "TARA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Tara - -@ MISSY - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "MISSY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Missy - -@ ALICE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "ALICE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Alice - -@ JENNY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jenny1 - -@ GRACE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "GRACE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grace - -@ TANYA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "TANYA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Tanya - -@ SHARON - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "SHARON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Sharon - -@ NIKKI - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "NIKKI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Nikki - -@ BRENDA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "BRENDA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brenda - -@ KATIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "KATIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Katie - -@ SUSIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "SUSIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Susie - -@ KARA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "KARA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Kara - -@ DANA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "DANA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Dana - -@ SIENNA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "SIENNA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Sienna - -@ DEBRA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "DEBRA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Debra - -@ LINDA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "LINDA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Linda - -@ KAYLEE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "KAYLEE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Kaylee - -@ LAUREL - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "LAUREL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Laurel - -@ CARLEE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "CARLEE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Carlee - -@ JENNY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jenny2 - -@ JENNY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jenny3 - -@ JENNY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jenny4 - -@ JENNY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jenny5 - -@ HEIDI - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "HEIDI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Heidi - -@ BECKY - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "BECKY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Becky - -@ CAROL - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "CAROL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Carol - -@ NANCY - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "NANCY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Nancy - -@ MARTHA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "MARTHA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Martha - -@ DIANA_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Diana1 - -@ CEDRIC - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "CEDRIC$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cedric - -@ IRENE - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "IRENE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Irene - -@ DIANA_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Diana2 - -@ DIANA_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Diana3 - -@ DIANA_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Diana4 - -@ DIANA_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Diana5 - -@ AMY_AND_LIV_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AmyAndLiv1 - -@ AMY_AND_LIV_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AmyAndLiv2 - -@ GINA_AND_MIA_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "GINA & MIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_GinaAndMia1 - -@ MIU_AND_YUKI - .byte 0 @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "MIU & YUKI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_MiuAndYuki - -@ AMY_AND_LIV_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AmyAndLiv3 - -@ GINA_AND_MIA_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "GINA & MIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_GinaAndMia2 - -@ AMY_AND_LIV_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AmyAndLiv4 - -@ AMY_AND_LIV_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AmyAndLiv5 - -@ AMY_AND_LIV_6 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_AmyAndLiv6 - -@ HUEY - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "HUEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Huey - -@ EDMOND - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "EDMOND$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Edmond - -@ ERNEST_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Ernest1 - -@ DWAYNE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "DWAYNE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Dwayne - -@ PHILLIP - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "PHILLIP$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Phillip - -@ LEONARD - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "LEONARD$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Leonard - -@ DUNCAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "DUNCAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Duncan - -@ ERNEST_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Ernest2 - -@ ERNEST_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Ernest3 - -@ ERNEST_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Ernest4 - -@ ERNEST_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Ernest5 - -@ ELI - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "ELI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Eli - -@ ANNIKA - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_F - .string "ANNIKA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Annika - -@ JAZMYN - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_2 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "JAZMYN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jazmyn - -@ JONAS - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "JONAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jonas - -@ KAYLEY - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PARASOL_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_PARASOL_LADY - .string "KAYLEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Kayley - -@ AURON - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_M - .string "AURON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Auron - -@ KELVIN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "KELVIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Kelvin - -@ MARLEY - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "MARLEY$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Marley - -@ REYNA - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "REYNA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Reyna - -@ HUDSON - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "HUDSON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Hudson - -@ CONOR - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_M - .string "CONOR$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Conor - -@ EDWIN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COLLECTOR - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_COLLECTOR - .string "EDWIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Edwin1 - -@ HECTOR - .byte 0 @ party type flags - .byte TRAINER_CLASS_COLLECTOR - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_COLLECTOR - .string "HECTOR$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Hector - -@ TABITHA_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_MAGMA_ADMIN - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_ADMIN - .string "TABITHA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Tabitha1 - -@ EDWIN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COLLECTOR - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_COLLECTOR - .string "EDWIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Edwin2 - -@ EDWIN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COLLECTOR - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_COLLECTOR - .string "EDWIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Edwin3 - -@ EDWIN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COLLECTOR - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_COLLECTOR - .string "EDWIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Edwin4 - -@ EDWIN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COLLECTOR - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_COLLECTOR - .string "EDWIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Edwin5 - -@ WALLY_1 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Wally1 - -@ BRENDAN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brendan1 - -@ BRENDAN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brendan2 - -@ BRENDAN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brendan3 - -@ BRENDAN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brendan4 - -@ BRENDAN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brendan5 - -@ BRENDAN_6 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brendan6 - -@ BRENDAN_7 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brendan7 - -@ BRENDAN_8 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brendan8 - -@ BRENDAN_9 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Brendan9 - -@ MAY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_May1 - -@ MAY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_May2 - -@ MAY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_May3 - -@ MAY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_May4 - -@ MAY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_May5 - -@ MAY_6 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_May6 - -@ MAY_7 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_May7 - -@ MAY_8 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_May8 - -@ MAY_9 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_May9 - -@ ISAAC_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Isaac1 - -@ DAVIS - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "DAVIS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Davis - -@ MITCHELL - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "MITCHELL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Mitchell - -@ ISAAC_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Isaac2 - -@ ISAAC_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Isaac3 - -@ ISAAC_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Isaac4 - -@ ISAAC_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Isaac5 - -@ LYDIA_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "LYDIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Lydia1 - -@ HALLE - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "HALLE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Halle - -@ GARRISON - .byte 0 @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "GARRISON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Garrison - -@ LYDIA_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "LYDIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Lydia2 - -@ LYDIA_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "LYDIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Lydia3 - -@ LYDIA_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "LYDIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Lydia4 - -@ LYDIA_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "LYDIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Lydia5 - -@ JACKSON_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jackson1 - -@ LORENZO - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_M - .string "LORENZO$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Lorenzo - -@ SEBASTIAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_M - .string "SEBASTIAN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Sebastian - -@ JACKSON_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jackson2 - -@ JACKSON_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jackson3 - -@ JACKSON_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Jackson4 - -@ JACKSON_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jackson5 - -@ CATHERINE_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Catherine1 - -@ JENNA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_F - .string "JENNA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jenna - -@ SOPHIA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_F - .string "SOPHIA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Sophia - -@ CATHERINE_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Catherine2 - -@ CATHERINE_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Catherine3 - -@ CATHERINE_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Catherine4 - -@ CATHERINE_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_RANGER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Catherine5 - -@ JULIO - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "JULIO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Julio - -@ GRUNT_27 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt27 - -@ GRUNT_28 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt28 - -@ GRUNT_29 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt29 - -@ GRUNT_30 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt30 - -@ MARC - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "MARC$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Marc - -@ BRENDEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "BRENDEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brenden - -@ LILITH - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "LILITH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Lilith - -@ CRISTIAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "CRISTIAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Cristian - -@ SYLVIA - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "SYLVIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Sylvia - -@ LEONARDO - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "LEONARDO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Leonardo - -@ ATHENA - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "ATHENA$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Athena - -@ HARRISON - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "HARRISON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Harrison - -@ GRUNT_31 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt31 - -@ CLARENCE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "CLARENCE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Clarence - -@ TERRY - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "TERRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Terry - -@ NATE - .byte 0 @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "NATE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Nate - -@ KATHLEEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_HEX_MANIAC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_HEX_MANIAC - .string "KATHLEEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Kathleen - -@ CLIFFORD - .byte 0 @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "CLIFFORD$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Clifford - -@ NICHOLAS - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "NICHOLAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Nicholas - -@ GRUNT_32 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt32 - -@ GRUNT_33 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt33 - -@ GRUNT_34 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt34 - -@ GRUNT_35 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt35 - -@ GRUNT_36 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt36 - -@ MACEY - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "MACEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Macey - -@ BRENDAN_10 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Brendan10 - -@ BRENDAN_11 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Brendan11 - -@ PAXTON - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_M - .string "PAXTON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Paxton - -@ ISABELLA - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "ISABELLA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Isabella - -@ GRUNT_37 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_AQUA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music - .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt37 - -@ TABITHA_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_MAGMA_ADMIN - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_ADMIN - .string "TABITHA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Tabitha2 - -@ JONATHAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "JONATHAN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jonathan - -@ BRENDAN_12 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Brendan12 - -@ MAY_10 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0xb @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_May10 - -@ MAXIE_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_MAGMA_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_LEADER_MAXIE - .string "MAXIE$", 12 - .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Maxie1 - -@ MAXIE_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_MAGMA_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_LEADER_MAXIE - .string "MAXIE$", 12 - .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Maxie2 - -@ TIANA - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "TIANA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Tiana - -@ HALEY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "HALEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Haley1 - -@ JANICE - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "JANICE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Janice - -@ VIVI - .byte 0 @ party type flags - .byte TRAINER_CLASS_WINSTRATE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "VIVI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Vivi - -@ HALEY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "HALEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Haley2 - -@ HALEY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "HALEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Haley3 - -@ HALEY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "HALEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Haley4 - -@ HALEY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "HALEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Haley5 - -@ SALLY - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "SALLY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Sally - -@ ROBIN - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "ROBIN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Robin - -@ ANDREA - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "ANDREA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Andrea - -@ CRISSY - .byte 0 @ party type flags - .byte TRAINER_CLASS_LASS - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LASS - .string "CRISSY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Crissy - -@ RICK - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "RICK$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Rick - -@ LYLE - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "LYLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Lyle - -@ JOSE - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "JOSE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jose - -@ DOUG - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "DOUG$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Doug - -@ GREG - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "GREG$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Greg - -@ KENT - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "KENT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Kent - -@ JAMES_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_James1 - -@ JAMES_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_James2 - -@ JAMES_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_James3 - -@ JAMES_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_James4 - -@ JAMES_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_CATCHER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_James5 - -@ BRICE - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "BRICE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Brice - -@ TRENT_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Trent1 - -@ LENNY - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "LENNY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Lenny - -@ LUCAS_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "LUCAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Lucas1 - -@ ALAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "ALAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Alan - -@ CLARK - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "CLARK$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Clark - -@ ERIC - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "ERIC$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Eric - -@ LUCAS_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "LUCAS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Lucas2 - -@ MIKE_1 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "MIKE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Mike1 - -@ MIKE_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "MIKE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Mike2 - -@ TRENT_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Trent2 - -@ TRENT_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Trent3 - -@ TRENT_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Trent4 - -@ TRENT_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Trent5 - -@ DEZ_AND_LUKE - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNG_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_YOUNG_COUPLE - .string "DEZ & LUKE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_DezAndLuke - -@ LEA_AND_JED - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNG_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_YOUNG_COUPLE - .string "LEA & JED$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_LeaAndJed - -@ KIRA_AND_DAN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNG_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_YOUNG_COUPLE - .string "KIRA & DAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_KiraAndDan1 - -@ KIRA_AND_DAN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNG_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_YOUNG_COUPLE - .string "KIRA & DAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_KiraAndDan2 - -@ KIRA_AND_DAN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNG_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_YOUNG_COUPLE - .string "KIRA & DAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_KiraAndDan3 - -@ KIRA_AND_DAN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNG_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_YOUNG_COUPLE - .string "KIRA & DAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_KiraAndDan4 - -@ KIRA_AND_DAN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNG_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_YOUNG_COUPLE - .string "KIRA & DAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_KiraAndDan5 - -@ JOHANNA - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "JOHANNA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Johanna - -@ GERALD - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "GERALD$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Gerald - -@ VIVIAN - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "VIVIAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Vivian - -@ DANIELLE - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "DANIELLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Danielle - -@ HIDEO - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "HIDEO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x3 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Hideo - -@ KEIGO - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "KEIGO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x3 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Keigo - -@ RILEY - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "RILEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x3 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Riley - -@ FLINT - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "FLINT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Flint - -@ ASHLEY - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "ASHLEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Ashley - -@ WALLY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Wally2 - -@ WALLY_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Wally3 - -@ WALLY_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Wally4 - -@ WALLY_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Wally5 - -@ WALLY_6 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Wally6 - -@ BRENDAN_13 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Brendan13 - -@ BRENDAN_14 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Brendan14 - -@ BRENDAN_15 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Brendan15 - -@ MAY_11 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_May11 - -@ MAY_12 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_May12 - -@ MAY_13 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_May13 - -@ JONAH - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "JONAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Jonah - -@ HENRY - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "HENRY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Henry - -@ ROGER - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "ROGER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Roger - -@ ALEXA - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "ALEXA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Alexa - -@ RUBEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "RUBEN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Ruben - -@ KOJI_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "KOJI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Koji1 - -@ WAYNE - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "WAYNE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Wayne - -@ AIDAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "AIDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Aidan - -@ REED - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "REED$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Reed - -@ TISHA - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "TISHA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Tisha - -@ TORI_AND_TIA - .byte 0 @ party type flags - .byte TRAINER_CLASS_TWINS - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_TWINS - .string "TORI & TIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_ToriAndTia - -@ KIM_AND_IRIS - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_SR_AND_JR - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_SR_AND_JR - .string "KIM & IRIS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_KimAndIris - -@ TYRA_AND_IVY - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_SR_AND_JR - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_SR_AND_JR - .string "TYRA & IVY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_TyraAndIvy - -@ MEL_AND_PAUL - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_YOUNG_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_YOUNG_COUPLE - .string "MEL & PAUL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_MelAndPaul - -@ JOHN_AND_JAY_1 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_OLD_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_JohnAndJay1 - -@ JOHN_AND_JAY_2 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_OLD_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_JohnAndJay2 - -@ JOHN_AND_JAY_3 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_OLD_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_JohnAndJay3 - -@ JOHN_AND_JAY_4 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_OLD_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0xb @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_JohnAndJay4 - -@ JOHN_AND_JAY_5 - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_OLD_COUPLE - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_JohnAndJay5 - -@ RELI_AND_IAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_SIS_AND_BRO - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SIS_AND_BRO - .string "RELI & IAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_ReliAndIan - -@ LILA_AND_ROY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SIS_AND_BRO - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SIS_AND_BRO - .string "LILA & ROY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_LilaAndRoy1 - -@ LILA_AND_ROY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SIS_AND_BRO - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SIS_AND_BRO - .string "LILA & ROY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_LilaAndRoy2 - -@ LILA_AND_ROY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SIS_AND_BRO - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SIS_AND_BRO - .string "LILA & ROY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_LilaAndRoy3 - -@ LILA_AND_ROY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SIS_AND_BRO - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SIS_AND_BRO - .string "LILA & ROY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_LilaAndRoy4 - -@ LILA_AND_ROY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SIS_AND_BRO - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SIS_AND_BRO - .string "LILA & ROY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_LilaAndRoy5 - -@ LISA_AND_RAY - .byte 0 @ party type flags - .byte TRAINER_CLASS_SIS_AND_BRO - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SIS_AND_BRO - .string "LISA & RAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_LisaAndRay - -@ CHRIS - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "CHRIS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Chris - -@ DAWSON - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_RICH_BOY - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_RICH_BOY - .string "DAWSON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Dawson - -@ SARAH - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LADY - .string "SARAH$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Sarah - -@ DARIAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "DARIAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Darian - -@ HAILEY - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_F - .string "HAILEY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Hailey - -@ CHANDLER - .byte 0 @ party type flags - .byte TRAINER_CLASS_TUBER_2 - .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_TUBER_M - .string "CHANDLER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Chandler - -@ KALEB - .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_POKEFAN - .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music - .byte TRAINER_PIC_WINSTRATE_M - .string "KALEB$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Kaleb - -@ JOSEPH - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "JOSEPH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Joseph - -@ ALYSSA - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ALYSSA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Alyssa - -@ MARCOS - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "MARCOS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Marcos - -@ RHETT - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "RHETT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Rhett - -@ TYRON - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "TYRON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Tyron - -@ CELINA - .byte 0 @ party type flags - .byte TRAINER_CLASS_AROMA_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_AROMA_LADY - .string "CELINA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Celina - -@ BIANCA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "BIANCA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Bianca - -@ HAYDEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "HAYDEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Hayden - -@ SOPHIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "SOPHIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Sophie - -@ COBY - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "COBY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Coby - -@ LAWRENCE - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "LAWRENCE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Lawrence - -@ WYATT - .byte 0 @ party type flags - .byte TRAINER_CLASS_POKEMANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_POKEMANIAC - .string "WYATT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Wyatt - -@ ANGELINA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "ANGELINA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Angelina - -@ KAI - .byte 0 @ party type flags - .byte TRAINER_CLASS_FISHERMAN - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_FISHERMAN - .string "KAI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Kai - -@ CHARLOTTE - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "CHARLOTTE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Charlotte - -@ DEANDRE - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "DEANDRE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Deandre - -@ GRUNT_38 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt38 - -@ GRUNT_39 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt39 - -@ GRUNT_40 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt40 - -@ GRUNT_41 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt41 - -@ GRUNT_42 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Grunt42 - -@ GRUNT_43 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt43 - -@ GRUNT_44 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt44 - -@ GRUNT_45 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt45 - -@ GRUNT_46 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt46 - -@ GRUNT_47 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt47 - -@ GRUNT_48 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt48 - -@ GRUNT_49 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt49 - -@ GRUNT_50 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt50 - -@ GRUNT_51 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt51 - -@ GRUNT_52 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt52 - -@ GRUNT_53 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TEAM_MAGMA - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "GRUNT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Grunt53 - -@ TABITHA_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_MAGMA_ADMIN - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_ADMIN - .string "TABITHA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Tabitha3 - -@ DARCY - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "DARCY$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Darcy - -@ MAXIE_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_MAGMA_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music - .byte TRAINER_PIC_MAGMA_LEADER_MAXIE - .string "MAXIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Maxie3 - -@ PETE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_M - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_M - .string "PETE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Pete - -@ ISABELLE - .byte 0 @ party type flags - .byte TRAINER_CLASS_SWIMMER_F - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMER_F - .string "ISABELLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Isabelle - -@ ANDRES_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "ANDRES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Andres1 - -@ JOSUE - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "JOSUE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Josue - -@ CAMRON - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "CAMRON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Camron - -@ CORY_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "CORY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Cory1 - -@ CAROLINA - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "CAROLINA$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Carolina - -@ ELIJAH - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "ELIJAH$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Elijah - -@ CELIA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PICNICKER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music - .byte TRAINER_PIC_PICNICKER - .string "CELIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Celia - -@ BRYAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "BRYAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Bryan - -@ BRANDEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_CAMPER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_CAMPER - .string "BRANDEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Branden - -@ BRYANT - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "BRYANT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Bryant - -@ SHAYLA - .byte 0 @ party type flags - .byte TRAINER_CLASS_AROMA_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_AROMA_LADY - .string "SHAYLA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Shayla - -@ KYRA - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "KYRA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Kyra - -@ JAIDEN - .byte 0 @ party type flags - .byte TRAINER_CLASS_NINJA_BOY - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_NINJA_BOY - .string "JAIDEN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Jaiden - -@ ALIX - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "ALIX$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Alix - -@ HELENE - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "HELENE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Helene - -@ MARLENE - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "MARLENE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Marlene - -@ DEVAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "DEVAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Devan - -@ JOHNSON - .byte 0 @ party type flags - .byte TRAINER_CLASS_YOUNGSTER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_YOUNGSTER - .string "JOHNSON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Johnson - -@ MELINA - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MELINA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Melina - -@ BRANDI - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "BRANDI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brandi - -@ AISHA - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "AISHA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Aisha - -@ MAKAYLA - .byte 0 @ party type flags - .byte TRAINER_CLASS_EXPERT - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_EXPERT_F - .string "MAKAYLA$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Makayla - -@ FABIAN - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "FABIAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Fabian - -@ DAYTON - .byte 0 @ party type flags - .byte TRAINER_CLASS_KINDLER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_KINDLER - .string "DAYTON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Dayton - -@ RACHEL - .byte 0 @ party type flags - .byte TRAINER_CLASS_PARASOL_LADY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_PARASOL_LADY - .string "RACHEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Rachel - -@ LEONEL - .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_M - .string "LEONEL$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Leonel - -@ CALLIE - .byte 0 @ party type flags - .byte TRAINER_CLASS_BATTLE_GIRL - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BATTLE_GIRL - .string "CALLIE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Callie - -@ CALE - .byte 0 @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "CALE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cale - -@ MYLES - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "MYLES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Myles - -@ PAT - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "PAT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Pat - -@ CRISTIN_1 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "CRISTIN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cristin1 - -@ MAY_14 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_May14 - -@ MAY_15 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_May15 - -@ ROXANNE_2 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_ROXANNE - .string "ROXANNE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Roxanne2 - -@ ROXANNE_3 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_ROXANNE - .string "ROXANNE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Roxanne3 - -@ ROXANNE_4 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_ROXANNE - .string "ROXANNE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Roxanne4 - -@ ROXANNE_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_ROXANNE - .string "ROXANNE$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Roxanne5 - -@ BRAWLY_2 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_BRAWLY - .string "BRAWLY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Brawly2 - -@ BRAWLY_3 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_BRAWLY - .string "BRAWLY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Brawly3 - -@ BRAWLY_4 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_BRAWLY - .string "BRAWLY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Brawly4 - -@ BRAWLY_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_BRAWLY - .string "BRAWLY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Brawly5 - -@ WATTSON_2 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WATTSON - .string "WATTSON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Wattson2 - -@ WATTSON_3 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WATTSON - .string "WATTSON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Wattson3 - -@ WATTSON_4 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WATTSON - .string "WATTSON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Wattson4 - -@ WATTSON_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WATTSON - .string "WATTSON$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Wattson5 - -@ FLANNERY_2 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_FLANNERY - .string "FLANNERY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Flannery2 - -@ FLANNERY_3 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_FLANNERY - .string "FLANNERY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Flannery3 - -@ FLANNERY_4 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_FLANNERY - .string "FLANNERY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Flannery4 - -@ FLANNERY_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_FLANNERY - .string "FLANNERY$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Flannery5 - -@ NORMAN_2 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_NORMAN - .string "NORMAN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 4 @ party size - .4byte gTrainerParty_Norman2 - -@ NORMAN_3 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_NORMAN - .string "NORMAN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Norman3 - -@ NORMAN_4 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_NORMAN - .string "NORMAN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Norman4 - -@ NORMAN_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_NORMAN - .string "NORMAN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Norman5 - -@ WINONA_2 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WINONA - .string "WINONA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x17 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Winona2 - -@ WINONA_3 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WINONA - .string "WINONA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x17 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Winona3 - -@ WINONA_4 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WINONA - .string "WINONA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x17 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Winona4 - -@ WINONA_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_WINONA - .string "WINONA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x17 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Winona5 - -@ TATE_AND_LIZA_2 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_TATE_AND_LIZA - .string "TATE&LIZA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_TateAndLiza2 - -@ TATE_AND_LIZA_3 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_TATE_AND_LIZA - .string "TATE&LIZA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_TateAndLiza3 - -@ TATE_AND_LIZA_4 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_TATE_AND_LIZA - .string "TATE&LIZA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_TateAndLiza4 - -@ TATE_AND_LIZA_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_TATE_AND_LIZA - .string "TATE&LIZA$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_TateAndLiza5 - -@ JUAN_2 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_JUAN - .string "JUAN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Juan2 - -@ JUAN_3 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_JUAN - .string "JUAN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 5 @ party size - .4byte gTrainerParty_Juan3 - -@ JUAN_4 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_JUAN - .string "JUAN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Juan4 - -@ JUAN_5 - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_LEADER - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEADER_JUAN - .string "JUAN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE @ items - .4byte TRUE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Juan5 - -@ ANGELO - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_BUG_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music - .byte TRAINER_PIC_BUG_MANIAC - .string "ANGELO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Angelo - -@ DARIUS - .byte 0 @ party type flags - .byte TRAINER_CLASS_BIRD_KEEPER - .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_BIRD_KEEPER - .string "DARIUS$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Darius - -@ STEVEN - .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_STEVEN - .string "STEVEN$", 12 - .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Steven - -@ ANABEL - .byte 0 @ party type flags - .byte TRAINER_CLASS_SALON_MAIDEN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SALON_MAIDEN_ANABEL - .string "ANABEL$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Anabel - -@ TUCKER - .byte 0 @ party type flags - .byte TRAINER_CLASS_DOME_ACE - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_DOME_ACE_TUCKER - .string "TUCKER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Tucker - -@ SPENSER - .byte 0 @ party type flags - .byte TRAINER_CLASS_PALACE_MAVEN - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_PALACE_MAVEN_SPENSER - .string "SPENSER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Spenser - -@ GRETA - .byte 0 @ party type flags - .byte TRAINER_CLASS_ARENA_TYCOON - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_ARENA_TYCOON_GRETA - .string "GRETA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Greta - -@ NOLAND - .byte 0 @ party type flags - .byte TRAINER_CLASS_FACTORY_HEAD - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_FACTORY_HEAD_NOLAND - .string "NOLAND$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Noland - -@ LUCY - .byte 0 @ party type flags - .byte TRAINER_CLASS_PIKE_QUEEN - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_PIKE_QUEEN_LUCY - .string "LUCY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Lucy - -@ BRANDON - .byte 0 @ party type flags - .byte TRAINER_CLASS_PYRAMID_KING - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_PYRAMID_KING_BRANDON - .string "BRANDON$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brandon - -@ ANDRES_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "ANDRES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Andres2 - -@ ANDRES_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "ANDRES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Andres3 - -@ ANDRES_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "ANDRES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Andres4 - -@ ANDRES_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_RUIN_MANIAC - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_RUIN_MANIAC - .string "ANDRES$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Andres5 - -@ CORY_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "CORY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Cory2 - -@ CORY_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "CORY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Cory3 - -@ CORY_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "CORY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Cory4 - -@ CORY_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_SAILOR - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_SAILOR - .string "CORY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Cory5 - -@ PABLO_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "PABLO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Pablo2 - -@ PABLO_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "PABLO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Pablo3 - -@ PABLO_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "PABLO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Pablo4 - -@ PABLO_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_TRIATHLETE - .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music - .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "PABLO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Pablo5 - -@ KOJI_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "KOJI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Koji2 - -@ KOJI_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "KOJI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Koji3 - -@ KOJI_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "KOJI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Koji4 - -@ KOJI_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BLACK_BELT - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_BLACK_BELT - .string "KOJI$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Koji5 - -@ CRISTIN_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "CRISTIN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Cristin2 - -@ CRISTIN_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "CRISTIN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Cristin3 - -@ CRISTIN_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "CRISTIN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Cristin4 - -@ CRISTIN_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_COOLTRAINER_1 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music - .byte TRAINER_PIC_COOL_TRAINER_F - .string "CRISTIN$", 12 - .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Cristin5 - -@ FERNANDO_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "FERNANDO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Fernando2 - -@ FERNANDO_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "FERNANDO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Fernando3 - -@ FERNANDO_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "FERNANDO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Fernando4 - -@ FERNANDO_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_GUITARIST - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_GUITARIST - .string "FERNANDO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Fernando5 - -@ SAWYER_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "SAWYER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Sawyer2 - -@ SAWYER_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "SAWYER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Sawyer3 - -@ SAWYER_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "SAWYER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Sawyer4 - -@ SAWYER_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_HIKER - .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music - .byte TRAINER_PIC_HIKER - .string "SAWYER$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x7 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Sawyer5 - -@ GABRIELLE_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "GABRIELLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Gabrielle2 - -@ GABRIELLE_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "GABRIELLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Gabrielle3 - -@ GABRIELLE_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "GABRIELLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Gabrielle4 - -@ GABRIELLE_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_BREEDER - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "GABRIELLE$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 6 @ party size - .4byte gTrainerParty_Gabrielle5 - -@ THALIA_2 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "THALIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Thalia2 - -@ THALIA_3 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "THALIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Thalia3 - -@ THALIA_4 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "THALIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Thalia4 - -@ THALIA_5 - .byte 0 @ party type flags - .byte TRAINER_CLASS_BEAUTY - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music - .byte TRAINER_PIC_BEAUTY - .string "THALIA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x1 @ AI flags - .4byte 3 @ party size - .4byte gTrainerParty_Thalia5 - -@ MARIELA - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_F - .string "MARIELA$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Mariela - -@ ALVARO - .byte 0 @ party type flags - .byte TRAINER_CLASS_PSYCHIC - .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music - .byte TRAINER_PIC_PSYCHIC_M - .string "ALVARO$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 2 @ party size - .4byte gTrainerParty_Alvaro - -@ EVERETT - .byte 0 @ party type flags - .byte TRAINER_CLASS_GENTLEMAN - .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music - .byte TRAINER_PIC_GENTLEMAN - .string "EVERETT$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Everett - -@ RED - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_RED - .string "RED$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Red - -@ LEAF - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_3 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_LEAF - .string "LEAF$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Leaf - -@ BRENDAN_16 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_4 - .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN - .string "BRENDAN$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_Brendan16 - -@ MAY_16 - .byte 0 @ party type flags - .byte TRAINER_CLASS_PKMN_TRAINER_4 - .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music - .byte TRAINER_PIC_RUBY_SAPPHIRE_MAY - .string "MAY$", 12 - .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items - .4byte FALSE @ is double battle - .4byte 0x0 @ AI flags - .4byte 1 @ party size - .4byte gTrainerParty_May16 -- cgit v1.2.3 From c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 22 Jul 2018 12:49:49 +0200 Subject: make union room compile i guess --- asm/rom_8011DC0.s | 1849 ++++++++++++++++++++++++ data/maps/events/LilycoveCity_ContestLobby.inc | 4 +- data/scripts/pokeblocks.inc | 16 +- include/librfu.h | 2 +- src/battle_bg.c | 20 +- src/battle_controllers.c | 92 +- src/battle_main.c | 46 +- src/battle_message.c | 18 +- src/link.c | 2 +- src/pokemon.c | 20 +- src/recorded_battle.c | 6 +- src/rom_8011DC0.c | 5 + 12 files changed, 1967 insertions(+), 113 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 4bfd02b18..163984108 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -5,7 +5,1856 @@ .text + thumb_func_start sub_80156E0 +sub_80156E0: @ 80156E0 + push {r4-r7,lr} + sub sp, 0xC + lsls r0, 24 + lsrs r4, r0, 24 + movs r5, 0 + ldr r0, =gUnknown_02022C30 + ldr r6, [r0] + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + ldr r1, =gTasks + 0x8 + adds r7, r0, r1 + ldrb r0, [r6, 0x14] + cmp r0, 0x38 + bls _08015702 + bl _08016878 +_08015702: + lsls r0, 2 + ldr r1, =_08015718 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_08015718: + .4byte _080157FC + .4byte _08015854 + .4byte _08015878 + .4byte _080158C8 + .4byte _080159A6 + .4byte _08015E5C + .4byte _08015C54 + .4byte _08015E5C + .4byte _08016864 + .4byte _080161C8 + .4byte _080162D4 + .4byte _080160AC + .4byte _080160C6 + .4byte _08016324 + .4byte _08016348 + .4byte _08016350 + .4byte _08016360 + .4byte _0801638E + .4byte _080163A2 + .4byte _08015F32 + .4byte _08015FB8 + .4byte _08015FD6 + .4byte _0801604A + .4byte _08015ADA + .4byte _08015B00 + .4byte _08015B78 + .4byte _08016838 + .4byte _08015D4C + .4byte _08015D34 + .4byte _08015DD0 + .4byte _08015C2A + .4byte _08015DA6 + .4byte _08015D9C + .4byte _08016158 + .4byte _08016178 + .4byte _080161B8 + .4byte _080162DC + .4byte _08016318 + .4byte _08015BF4 + .4byte _08016104 + .4byte _08015E94 + .4byte _08015EC4 + .4byte _080163CC + .4byte _0801645C + .4byte _080165A8 + .4byte _08016610 + .4byte _0801662C + .4byte _08016478 + .4byte _08016634 + .4byte _08016738 + .4byte _0801676C + .4byte _080167F4 + .4byte _0801652C + .4byte _080164E0 + .4byte _080164F4 + .4byte _0801658C + .4byte _080165DC +_080157FC: + movs r0, 0x70 + bl AllocZeroed + str r0, [r6, 0x4] + movs r0, 0x70 + bl AllocZeroed + str r0, [r6, 0xC] + movs r0, 0x80 + lsls r0, 1 + bl AllocZeroed + str r0, [r6] + movs r0, 0x20 + bl AllocZeroed + str r0, [r6, 0x8] + ldr r0, [r6] + movs r1, 0x8 + bl sub_8017580 + ldr r1, =gUnknown_02022C2C + movs r0, 0x40 + strb r0, [r1] + ldr r0, [r6, 0xC] + ldr r1, [r6, 0x4] + movs r2, 0x9 + bl sub_8016DF0 + adds r1, r6, 0 + adds r1, 0x20 + strb r0, [r1] + adds r0, r6, 0 + adds r0, 0xA0 + bl sub_8019BA8 + bl sub_8019F2C + movs r0, 0x1 + bl _08016876 + .pool +_08015854: + adds r0, r6, 0 + adds r0, 0x21 + movs r2, 0 + ldrsh r1, [r7, r2] + bl sub_8019E70 + ldrh r0, [r7] + adds r0, 0x1 + strh r0, [r7] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x8 + beq _08015872 + bl _08016878 +_08015872: + movs r0, 0x2 + bl _08016876 +_08015878: + movs r0, 0x40 + movs r1, 0 + movs r2, 0 + bl sub_8010F84 + ldr r2, =gUnknown_02022C40 + ldrh r0, [r2, 0x2] + ldrh r1, [r2, 0xA] + ldrh r2, [r2, 0xC] + bl sub_8010FCC + bl sub_800B488 + bl OpenLink + bl sub_8011C84 + ldr r0, [r6, 0x8] + movs r1, 0x1 + bl sub_8017580 + ldr r0, [r6, 0x4] + movs r1, 0x4 + bl sub_80175EC + ldr r0, [r6, 0xC] + movs r1, 0x4 + bl sub_80175EC + ldr r1, =gSpecialVar_Result + movs r0, 0 + strh r0, [r1] + movs r0, 0x3 + bl _08016876 + .pool +_080158C8: + bl sub_81B1360 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x8 + beq _080158E0 + bl sub_81B1360 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x9 + bne _080159A0 +_080158E0: + ldr r4, =gUnknown_02022C40 + ldrh r0, [r4] + cmp r0, 0 + beq _080159A0 + bl GetCursorSelectionMonId + lsls r0, 24 + lsrs r5, r0, 24 + ldrh r0, [r4] + cmp r0, 0x1 + beq _08015900 + cmp r0, 0x2 + beq _08015950 + b _0801598E + .pool +_08015900: + movs r0, 0x54 + movs r1, 0 + movs r2, 0x1 + bl sub_8011090 + cmp r5, 0x5 + bls _0801592C + adds r0, r4, 0 + bl sub_801807C + movs r0, 0 + movs r1, 0 + movs r2, 0 + bl sub_8010FCC + ldr r0, =gUnknown_082EF4FC + bl sub_801568C + b _0801598E + .pool +_0801592C: + bl GetCursorSelectionMonId + lsls r0, 24 + lsrs r0, 24 + adds r1, r4, 0 + bl sub_80180A0 + cmp r0, 0 + bne _0801594C + ldr r1, =gUnknown_082EF47C + movs r0, 0x34 + bl sub_8015664 + b _0801598E + .pool +_0801594C: + movs r0, 0x37 + b _0801598C +_08015950: + adds r0, r6, 0 + bl sub_80156C8 + ldrb r0, [r4, 0x8] + strh r0, [r7, 0x2] + cmp r5, 0x5 + bls _0801596C + ldr r0, =gUnknown_082EF544 + bl sub_801568C + b _0801598E + .pool +_0801596C: + movs r0, 0x54 + movs r1, 0 + movs r2, 0x1 + bl sub_8011090 + ldr r1, =gUnknown_02022C2C + movs r0, 0x44 + strb r0, [r1] + bl GetCursorSelectionMonId + lsls r0, 24 + lsrs r0, 24 + adds r1, r4, 0 + bl sub_80180E8 + movs r0, 0x33 +_0801598C: + strb r0, [r6, 0x14] +_0801598E: + ldr r1, =gUnknown_02022C40 + movs r0, 0 + strh r0, [r1] + bl _08016878 + .pool +_080159A0: + movs r0, 0x4 + bl _08016876 +_080159A6: + ldr r4, =gSpecialVar_Result + ldrh r0, [r4] + cmp r0, 0 + beq _08015A0A + cmp r0, 0x9 + bne _080159E0 + movs r0, 0x54 + movs r1, 0 + movs r2, 0x1 + bl sub_8011090 + movs r0, 0x2 + bl PlaySE + ldr r0, =gStringVar1 + ldr r1, =gSaveBlock2Ptr + ldr r1, [r1] + bl StringCopy + movs r1, 0 + movs r0, 0x2A + b _08015A02 + .pool +_080159E0: + cmp r0, 0xB + bne _080159F4 + movs r0, 0x54 + movs r1, 0 + movs r2, 0x1 + bl sub_8011090 + movs r1, 0 + movs r0, 0x17 + b _08015A02 +_080159F4: + movs r0, 0 + strh r0, [r7] + ldrh r0, [r4] + subs r0, 0x1 + strh r0, [r7, 0x2] + movs r1, 0 + movs r0, 0x18 +_08015A02: + strb r0, [r6, 0x14] + strh r1, [r4] + bl _08016878 +_08015A0A: + bl ScriptContext2_IsEnabled + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bne _08015A1A + bl _08016878 +_08015A1A: + ldr r0, =gMain + ldrh r1, [r0, 0x2E] + movs r0, 0x1 + ands r0, r1 + cmp r0, 0 + beq _08015A80 + ldr r0, [r6] + adds r2, r7, 0x2 + adds r3, r6, 0 + adds r3, 0x21 + adds r1, r7, 0 + bl sub_801A2A8 + cmp r0, 0 + beq _08015A4C + movs r0, 0x5 + bl PlaySE + bl sub_80181CC + movs r0, 0x18 + bl _08016876 + .pool +_08015A4C: + bl sub_8017940 + cmp r0, 0 + beq _08015A80 + movs r0, 0x54 + movs r1, 0 + movs r2, 0x1 + bl sub_8011090 + movs r0, 0x2 + bl PlaySE + bl sub_80181CC + ldr r0, =gStringVar1 + ldr r1, =gSaveBlock2Ptr + ldr r1, [r1] + bl StringCopy + movs r0, 0x2D + bl _08016876 + .pool +_08015A80: + bl sub_8016B00 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x2 + beq _08015AA2 + cmp r0, 0x2 + bgt _08015A96 + cmp r0, 0x1 + beq _08015A9C + b _08015AD0 +_08015A96: + cmp r0, 0x4 + beq _08015AAA + b _08015AD0 +_08015A9C: + movs r0, 0x2 + bl PlaySE +_08015AA2: + adds r0, r6, 0 + bl sub_801A274 + b _08015AD0 +_08015AAA: + movs r0, 0xB + strb r0, [r6, 0x14] + bl sub_80181CC + movs r0, 0 + movs r1, 0 + movs r2, 0 + bl sub_8010FCC + adds r0, r6, 0 + bl sub_80181DC + adds r1, r0, 0 + lsls r1, 24 + lsrs r1, 24 + movs r0, 0x53 + movs r2, 0 + bl sub_8011090 +_08015AD0: + adds r0, r6, 0 + bl sub_801A284 + bl _08016878 +_08015ADA: + ldr r0, =sub_809FA34 + bl FuncIsActiveTask + lsls r0, 24 + cmp r0, 0 + beq _08015AEA + bl _08016878 +_08015AEA: + movs r0, 0x40 + movs r1, 0 + movs r2, 0 + bl sub_8011090 + movs r0, 0x4 + bl _08016876 + .pool +_08015B00: + bl sub_801704C + movs r3, 0x2 + ldrsh r0, [r7, r3] + ldr r1, [r6] + bl sub_8017CF8 + adds r4, r0, 0 + movs r0, 0x54 + movs r1, 0 + movs r2, 0x1 + bl sub_8011090 + ldr r0, [r6] + ldrb r1, [r7] + ldrb r2, [r7, 0x2] + adds r3, r4, 0 + bl sub_80179D4 + cmp r0, 0x1 + beq _08015B44 + cmp r0, 0x1 + bgt _08015B36 + cmp r0, 0 + beq _08015B3E + bl _08016878 +_08015B36: + cmp r0, 0x2 + beq _08015B68 + bl _08016878 +_08015B3E: + movs r0, 0x1A + bl _08016876 +_08015B44: + movs r1, 0x2 + ldrsh r0, [r7, r1] + lsls r0, 5 + ldr r1, [r6] + adds r1, r0 + adds r0, r1, 0 + adds r0, 0x10 + ldr r2, =gUnknown_02022C2C + ldrb r2, [r2] + bl sub_8012188 + strh r5, [r6, 0x12] + movs r0, 0x19 + bl _08016876 + .pool +_08015B68: + ldr r1, =gStringVar4 + movs r0, 0x13 + bl sub_8015664 + bl _08016878 + .pool +_08015B78: + bl sub_801704C + bl sub_8011A74 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x1 + blt _08015BBE + cmp r4, 0x2 + ble _08015B9A + cmp r4, 0x4 + bne _08015BBE + movs r0, 0x1 + bl sub_801818C + strb r4, [r6, 0x14] + b _08015BBE +_08015B9A: + bl sub_8011B90 + cmp r0, 0x1 + bne _08015BB0 + ldr r0, =gUnknown_082EE6C8 + bl sub_801568C + b _08015BB8 + .pool +_08015BB0: + ldr r1, =gUnknown_082EE6C8 + movs r0, 0x1E + bl sub_8015664 +_08015BB8: + ldr r1, =gUnknown_02022C2C + movs r0, 0x40 + strb r0, [r1] +_08015BBE: + ldr r0, =gReceivedRemoteLinkPlayers + ldrb r0, [r0] + cmp r0, 0 + bne _08015BCA + bl _08016878 +_08015BCA: + ldr r0, =gBlockSendBuffer + movs r1, 0x1 + bl sub_80143E4 + ldr r0, =sub_80140E0 + movs r1, 0x5 + bl CreateTask + movs r0, 0x26 + bl _08016876 + .pool +_08015BF4: + ldr r0, =sub_80140E0 + bl FuncIsActiveTask + lsls r0, 24 + cmp r0, 0 + beq _08015C04 + bl _08016878 +_08015C04: + ldr r0, =gUnknown_02022C2C + ldrb r0, [r0] + cmp r0, 0x44 + bne _08015C24 + ldr r1, =gUnknown_082EE004 + movs r0, 0x1F + bl sub_8015664 + bl _08016878 + .pool +_08015C24: + movs r0, 0x5 + bl _08016876 +_08015C2A: + ldr r0, =gReceivedRemoteLinkPlayers + ldrb r0, [r0] + cmp r0, 0 + beq _08015C36 + bl _08016878 +_08015C36: + movs r0, 0 + bl sub_801818C + movs r2, 0 + ldrsh r0, [r7, r2] + movs r3, 0x2 + ldrsh r1, [r7, r3] + ldr r2, [r6] + bl sub_801A3D0 + movs r0, 0x2 + bl _08016876 + .pool +_08015C54: + adds r0, r6, 0 + adds r0, 0x16 + adds r1, r6, 0 + adds r1, 0x1B + adds r2, r6, 0 + adds r2, 0x1C + ldr r3, =gUnknown_082F021C + ldr r4, =gUnknown_082F0244 + str r4, [sp] + bl sub_8017178 + adds r5, r0, 0 + movs r0, 0x1 + negs r0, r0 + cmp r5, r0 + bne _08015C78 + bl _08016878 +_08015C78: + ldr r0, =gReceivedRemoteLinkPlayers + ldrb r0, [r0] + cmp r0, 0 + bne _08015C94 + movs r0, 0x1C + bl _08016876 + .pool +_08015C94: + adds r1, r6, 0 + adds r1, 0x98 + movs r0, 0 + strh r0, [r1] + movs r2, 0x2 + ldrsh r0, [r7, r2] + ldr r1, [r6] + bl sub_8017CF8 + movs r0, 0x2 + negs r0, r0 + cmp r5, r0 + beq _08015CB2 + cmp r5, 0x40 + bne _08015CE4 +_08015CB2: + adds r0, r6, 0 + adds r0, 0x4C + movs r1, 0x40 + strh r1, [r0] + bl sub_800FE50 + ldr r0, =gStringVar4 + ldr r2, =gUnknown_082EEB80 + ldr r1, =gLinkPlayers + ldrb r1, [r1, 0x13] + lsls r1, 2 + adds r1, r2 + ldr r1, [r1] + bl StringCopy + movs r0, 0x20 + bl _08016876 + .pool +_08015CE4: + ldr r0, =gUnknown_02022C2C + strb r5, [r0] + ldr r1, =gUnknown_02022C2D + lsrs r0, r5, 8 + strb r0, [r1] + lsls r0, r5, 24 + lsrs r0, 24 + cmp r0, 0x41 + bne _08015D18 + bl sub_8018024 + cmp r0, 0 + bne _08015D18 + ldr r1, =gUnknown_082EEBD0 + movs r0, 0x5 + bl sub_8015664 + bl _08016878 + .pool +_08015D18: + ldr r0, =gUnknown_02022C2C + ldrb r0, [r0] + movs r1, 0x40 + orrs r1, r0 + adds r0, r6, 0 + adds r0, 0x4C + strh r1, [r0] + bl sub_800FE50 + movs r0, 0x1B + bl _08016876 + .pool +_08015D34: + ldr r0, =gStringVar4 + ldr r1, =gUnknown_082EEB88 + bl StringCopy + movs r0, 0x24 + bl _08016876 + .pool +_08015D4C: + adds r0, r6, 0 + bl sub_8017FD8 + movs r3, 0x2 + ldrsh r0, [r7, r3] + ldr r1, [r6] + bl sub_8017CF8 + adds r4, r0, 0 + adds r0, r6, 0 + adds r0, 0x4C + ldrh r1, [r0] + movs r0, 0x3F + ands r0, r1 + bl sub_8017984 + adds r5, r0, 0 + adds r0, r6, 0 + adds r0, 0x16 + ldr r3, =gUnknown_082EE82C + lsls r1, r5, 2 + lsls r2, r4, 4 + adds r1, r2 + adds r1, r3 + ldr r1, [r1] + bl PrintOnTextbox + lsls r0, 24 + cmp r0, 0 + bne _08015D8C + bl _08016878 +_08015D8C: + movs r0, 0 + strh r0, [r7, 0x6] + movs r0, 0x1D + bl _08016876 + .pool +_08015D9C: + bl sub_800AC34 + movs r0, 0x24 + bl _08016876 +_08015DA6: + adds r0, r6, 0 + adds r0, 0x4C + movs r1, 0x44 + strh r1, [r0] + ldr r2, =gUnknown_02022C40 + ldrh r1, [r2, 0xE] + adds r3, r6, 0 + adds r3, 0x4E + strh r1, [r3] + ldrh r2, [r2, 0x10] + adds r1, r6, 0 + adds r1, 0x50 + strh r2, [r1] + bl sub_800FE50 + movs r0, 0x1D + bl _08016876 + .pool +_08015DD0: + ldr r0, =gReceivedRemoteLinkPlayers + ldrb r0, [r0] + cmp r0, 0 + bne _08015DF4 + ldr r0, =gStringVar4 + ldr r1, =gUnknown_082EEB88 + bl StringCopy + movs r0, 0x1C + bl _08016876 + .pool +_08015DF4: + adds r0, r6, 0 + bl sub_8017FD8 + adds r0, r6, 0 + adds r0, 0x98 + ldrh r0, [r0] + cmp r0, 0x51 + bne _08015E2A + ldr r0, =gUnknown_02022C2C + ldrb r0, [r0] + cmp r0, 0x8 + bne _08015E24 + ldr r0, =gStringVar4 + adds r1, r6, 0 + movs r2, 0 + bl sub_8018220 + movs r0, 0x28 + bl _08016876 + .pool +_08015E24: + movs r0, 0xD + bl _08016876 +_08015E2A: + cmp r0, 0x52 + beq _08015E32 + bl _08016878 +_08015E32: + movs r5, 0 + movs r0, 0x20 + strb r0, [r6, 0x14] + ldr r0, =gStringVar4 + ldr r4, =gUnknown_02022C2C + ldrb r2, [r4] + movs r1, 0x40 + orrs r1, r2 + ldr r2, =gLinkPlayers + ldrb r2, [r2, 0x13] + bl sub_8017D9C + strb r5, [r4] + bl _08016878 + .pool +_08015E5C: + movs r0, 0x2 + ldrsh r1, [r7, r0] + lsls r1, 5 + ldr r0, [r6] + adds r0, r1 + bl sub_80179AC + adds r5, r0, 0 + movs r1, 0x2 + ldrsh r0, [r7, r1] + ldr r1, [r6] + bl sub_8017CF8 + adds r4, r0, 0 + ldr r2, =gUnknown_082EE24C + lsls r0, r4, 2 + lsls r1, r5, 3 + adds r0, r1 + adds r0, r2 + ldr r1, [r0] + movs r0, 0x6 + bl sub_8015664 + bl _08016878 + .pool +_08015E94: + adds r0, r6, 0 + adds r0, 0x16 + ldr r1, =gStringVar4 + bl PrintOnTextbox + lsls r0, 24 + cmp r0, 0 + bne _08015EA8 + bl _08016878 +_08015EA8: + movs r4, 0 + movs r0, 0x29 + strb r0, [r6, 0x14] + bl sub_800ADF8 + adds r0, r6, 0 + adds r0, 0x98 + strh r4, [r0] + adds r0, 0x2 + strh r4, [r0] + bl _08016878 + .pool +_08015EC4: + bl sub_800A520 + lsls r0, 24 + cmp r0, 0 + bne _08015ED2 + bl _08016878 +_08015ED2: + bl GetMultiplayerId + lsls r0, 24 + cmp r0, 0 + bne _08015F2C + ldr r5, =gStringVar1 + bl GetMultiplayerId + movs r1, 0x1 + eors r0, r1 + lsls r0, 24 + lsrs r0, 24 + lsls r1, r0, 3 + subs r1, r0 + lsls r1, 2 + ldr r4, =gLinkPlayers + 8 + adds r1, r4 + adds r0, r5, 0 + bl StringCopy + ldrh r0, [r4, 0x18] + adds r4, 0x1C + adds r1, r4, 0 + bl sub_800E540 + adds r5, r0, 0 + ldr r0, =gStringVar4 + ldr r2, =gUnknown_082EE378 + lsls r1, r5, 2 + adds r1, r2 + ldr r1, [r1] + bl StringExpandPlaceholders + movs r0, 0x21 + bl _08016876 + .pool +_08015F2C: + movs r0, 0x7 + bl _08016876 +_08015F32: + adds r0, r6, 0 + adds r0, 0x16 + movs r1, 0 + bl sub_80170B8 + lsls r0, 24 + asrs r5, r0, 24 + cmp r5, 0 + beq _08015F5C + cmp r5, 0 + bgt _08015F54 + movs r0, 0x1 + negs r0, r0 + cmp r5, r0 + beq _08015F98 + bl _08016878 +_08015F54: + cmp r5, 0x1 + beq _08015F98 + bl _08016878 +_08015F5C: + movs r0, 0 + bl CopyBgTilemapBufferToVram + ldr r4, =gUnknown_02022C2C + movs r0, 0x45 + strb r0, [r4] + movs r0, 0x45 + movs r1, 0 + movs r2, 0x1 + bl sub_8011090 + movs r2, 0x2 + ldrsh r0, [r7, r2] + lsls r0, 5 + ldr r1, [r6] + adds r1, r0 + adds r0, r1, 0 + adds r0, 0x10 + ldrb r2, [r4] + bl sub_8012188 + ldrh r0, [r7, 0x2] + strh r0, [r6, 0x12] + movs r0, 0x14 + strb r0, [r6, 0x14] + strh r5, [r7, 0x6] + bl _08016878 + .pool +_08015F98: + movs r3, 0x2 + ldrsh r0, [r7, r3] + ldr r1, [r6] + bl sub_8017CF8 + adds r4, r0, 0 + ldr r1, =gUnknown_082EEC9C + lsls r0, r4, 2 + adds r0, r1 + ldr r0, [r0] + bl sub_801568C + bl _08016878 + .pool +_08015FB8: + ldrh r0, [r7, 0x4] + adds r0, 0x1 + strh r0, [r7, 0x4] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x3C + bgt _08015FCA + bl _08016878 +_08015FCA: + movs r1, 0 + movs r0, 0x15 + strb r0, [r6, 0x14] + strh r1, [r7, 0x4] + bl _08016878 +_08015FD6: + bl sub_8011A74 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x3 + beq _0801603C + cmp r4, 0x3 + ble _08015FF4 + cmp r4, 0x4 + bne _08016040 + movs r0, 0x1 + bl sub_801818C + strb r4, [r6, 0x14] + b _08016040 +_08015FF4: + cmp r4, 0x1 + blt _08016040 + movs r1, 0x2 + ldrsh r0, [r7, r1] + ldr r1, [r6] + bl sub_8017CF8 + adds r4, r0, 0 + movs r0, 0x54 + movs r1, 0 + movs r2, 0x1 + bl sub_8011090 + bl sub_8011B90 + cmp r0, 0x1 + bne _08016028 + ldr r0, =gUnknown_082EED3C + lsls r1, r4, 2 + adds r1, r0 + ldr r0, [r1] + bl sub_801568C + b _08016040 + .pool +_08016028: + ldr r0, =gUnknown_082EED3C + lsls r1, r4, 2 + adds r1, r0 + ldr r1, [r1] + movs r0, 0x1E + bl sub_8015664 + b _08016040 + .pool +_0801603C: + movs r0, 0x16 + strb r0, [r6, 0x14] +_08016040: + ldrh r0, [r7, 0x6] + adds r0, 0x1 + strh r0, [r7, 0x6] + bl _08016878 +_0801604A: + bl sub_8011A80 + cmp r0, 0 + beq _08016092 + movs r2, 0x2 + ldrsh r0, [r7, r2] + ldr r1, [r6] + bl sub_8017CF8 + adds r4, r0, 0 + movs r0, 0x54 + movs r1, 0 + movs r2, 0x1 + bl sub_8011090 + bl sub_8011B90 + cmp r0, 0x1 + bne _08016084 + ldr r0, =gUnknown_082EED3C + lsls r1, r4, 2 + adds r1, r0 + ldr r0, [r1] + bl sub_801568C + b _08016092 + .pool +_08016084: + ldr r0, =gUnknown_082EED3C + lsls r1, r4, 2 + adds r1, r0 + ldr r1, [r1] + movs r0, 0x1E + bl sub_8015664 +_08016092: + ldr r0, =gReceivedRemoteLinkPlayers + ldrb r0, [r0] + cmp r0, 0 + bne _0801609E + bl _08016878 +_0801609E: + movs r0, 0x10 + bl _08016876 + .pool +_080160AC: + movs r0, 0x49 + bl PlaySE + bl sub_800EF7C + movs r0, 0 + movs r1, 0xC + strb r1, [r6, 0x14] + adds r1, r6, 0 + adds r1, 0x9A + strh r0, [r1] + bl _08016878 +_080160C6: + bl sub_8011A80 + cmp r0, 0 + beq _080160DA + movs r0, 0 + bl sub_801818C + movs r0, 0x2 + bl _08016876 +_080160DA: + ldr r0, =gReceivedRemoteLinkPlayers + ldrb r0, [r0] + cmp r0, 0 + bne _080160E4 + b _08016878 +_080160E4: + ldr r0, =gBlockSendBuffer + movs r1, 0x1 + bl sub_80143E4 + ldr r0, =sub_80140E0 + movs r1, 0x5 + bl CreateTask + movs r0, 0x27 + b _08016876 + .pool +_08016104: + adds r0, r6, 0 + bl sub_801689C + ldr r0, =sub_80140E0 + bl FuncIsActiveTask + lsls r0, 24 + cmp r0, 0 + beq _08016118 + b _08016878 +_08016118: + movs r0, 0x21 + strb r0, [r6, 0x14] + ldr r0, =gStringVar1 + ldr r4, =gLinkPlayers + 0x1C + 0x08 @ &gLinkPlayers[1].name + adds r1, r4, 0 + bl StringCopy + adds r0, r4, 0 + subs r0, 0x24 + ldrh r0, [r0, 0x20] + adds r1, r4, 0 + bl sub_800E540 + adds r5, r0, 0 + ldr r0, =gStringVar4 + ldr r2, =gUnknown_082EE324 + lsls r1, r5, 2 + adds r1, r2 + ldr r1, [r1] + bl StringExpandPlaceholders + b _08016878 + .pool +_08016158: + adds r0, r6, 0 + bl sub_801689C + adds r0, r6, 0 + adds r0, 0x16 + ldr r1, =gStringVar4 + bl PrintOnTextbox + lsls r0, 24 + cmp r0, 0 + bne _08016170 + b _08016878 +_08016170: + movs r0, 0x22 + b _08016876 + .pool +_08016178: + adds r0, r6, 0 + bl sub_801689C + adds r0, r6, 0 + bl sub_80168DC + cmp r0, 0 + bne _0801618A + b _08016878 +_0801618A: + ldr r0, =gMain + ldrh r1, [r0, 0x2E] + movs r0, 0x2 + ands r0, r1 + cmp r0, 0 + bne _08016198 + b _08016878 +_08016198: + movs r0, 0x1 + bl sub_8011DE0 + ldr r0, =gStringVar4 + ldr r1, =gUnknown_082EE598 + bl StringCopy + movs r0, 0x24 + b _08016876 + .pool +_080161B8: + ldr r1, =gStringVar4 + movs r0, 0x9 + bl sub_8015664 + b _08016878 + .pool +_080161C8: + adds r0, r6, 0 + adds r0, 0x16 + movs r1, 0 + bl sub_80170B8 + lsls r0, 24 + asrs r1, r0, 24 + cmp r1, 0 + beq _080161EE + cmp r1, 0 + bgt _080161E8 + movs r0, 0x1 + negs r0, r0 + cmp r1, r0 + beq _080162AE + b _08016878 +_080161E8: + cmp r1, 0x1 + beq _080162AE + b _08016878 +_080161EE: + adds r0, r6, 0 + adds r0, 0x4C + movs r1, 0x51 + strh r1, [r0] + ldr r1, =gUnknown_02022C2C + ldrb r1, [r1] + adds r5, r0, 0 + cmp r1, 0x45 + bne _08016220 + movs r4, 0x40 + orrs r4, r1 + movs r0, 0x1 + bl sub_801100C + adds r1, r0, 0 + lsls r1, 24 + lsrs r1, 24 + adds r0, r4, 0 + movs r2, 0 + bl sub_8011090 + b _0801623E + .pool +_08016220: + movs r0, 0x40 + adds r4, r1, 0 + orrs r4, r0 + lsls r4, 24 + lsrs r4, 24 + movs r0, 0x1 + bl sub_801100C + adds r1, r0, 0 + lsls r1, 24 + lsrs r1, 24 + adds r0, r4, 0 + movs r2, 0x1 + bl sub_8011090 +_0801623E: + ldr r1, [r6, 0x8] + movs r0, 0 + strb r0, [r1, 0x1B] + strh r0, [r7, 0x6] + ldr r0, =gUnknown_02022C2C + ldrb r0, [r0] + cmp r0, 0x41 + bne _08016286 + bl sub_8018024 + cmp r0, 0 + bne _0801627C + movs r0, 0x52 + strh r0, [r5] + adds r0, r5, 0 + bl sub_800FE50 + movs r0, 0xA + strb r0, [r6, 0x14] + ldr r0, =gStringVar4 + ldr r1, =gUnknown_082EEC14 + bl StringCopy + b _08016878 + .pool +_0801627C: + adds r0, r5, 0 + bl sub_800FE50 + movs r0, 0xD + b _08016876 +_08016286: + cmp r0, 0x48 + bne _080162A4 + adds r0, r5, 0 + bl sub_800FE50 + ldr r0, =gStringVar4 + adds r1, r6, 0 + movs r2, 0x1 + bl sub_8018220 + movs r0, 0x28 + b _08016876 + .pool +_080162A4: + adds r0, r5, 0 + bl sub_800FE50 + movs r0, 0xD + b _08016876 +_080162AE: + adds r0, r6, 0 + adds r0, 0x4C + movs r1, 0x52 + strh r1, [r0] + bl sub_800FE50 + movs r0, 0xA + strb r0, [r6, 0x14] + ldr r0, =gStringVar4 + ldr r1, =gUnknown_02022C2C + ldrb r1, [r1] + bl sub_8013078 + b _08016878 + .pool +_080162D4: + bl sub_800AC34 + movs r0, 0x24 + b _08016876 +_080162DC: + ldr r0, =gReceivedRemoteLinkPlayers + ldrb r4, [r0] + cmp r4, 0 + beq _080162E6 + b _08016878 +_080162E6: + ldr r1, =gUnknown_02022C2C + movs r0, 0x40 + strb r0, [r1] + ldr r1, =gStringVar4 + movs r0, 0x25 + bl sub_8015664 + adds r0, r6, 0 + adds r0, 0x4C + movs r1, 0 + movs r2, 0xC + bl memset + adds r0, r6, 0 + adds r0, 0x9A + strh r4, [r0] + subs r0, 0x2 + strh r4, [r0] + b _08016878 + .pool +_08016318: + movs r0, 0x2 + strb r0, [r6, 0x14] + movs r0, 0 + bl sub_801818C + b _08016878 +_08016324: + ldr r4, =gStringVar4 + ldr r0, =gUnknown_02022C2C + ldrb r0, [r0] + movs r1, 0x40 + orrs r1, r0 + adds r0, r4, 0 + bl sub_8017E00 + movs r0, 0xE + adds r1, r4, 0 + bl sub_8015664 + b _08016878 + .pool +_08016348: + bl sub_800ADF8 + movs r0, 0xF + b _08016876 +_08016350: + bl sub_800A520 + lsls r0, 24 + cmp r0, 0 + bne _0801635C + b _08016878 +_0801635C: + movs r0, 0x10 + b _08016876 +_08016360: + ldr r0, [r6, 0x8] + bl Free + ldr r0, [r6] + bl Free + ldr r0, [r6, 0xC] + bl Free + ldr r0, [r6, 0x4] + bl Free + adds r0, r6, 0 + adds r0, 0x20 + ldrb r0, [r0] + bl DestroyTask + adds r0, r6, 0 + adds r0, 0x21 + bl sub_8019F04 + movs r0, 0x11 + b _08016876 +_0801638E: + movs r0, 0x1 + negs r0, r0 + movs r1, 0 + str r1, [sp] + movs r2, 0 + movs r3, 0x10 + bl BeginNormalPaletteFade + movs r0, 0x12 + b _08016876 +_080163A2: + bl UpdatePaletteFade + lsls r0, 24 + cmp r0, 0 + beq _080163AE + b _08016878 +_080163AE: + bl sub_8019E3C + adds r0, r4, 0 + bl DestroyTask + ldr r0, =gUnknown_02022C30 + ldr r0, [r0] + bl Free + bl sub_80149D8 + b _08016878 + .pool +_080163CC: + bl sub_800F7DC + ldrh r1, [r0, 0x8] + ldr r4, =0x000003ff + adds r0, r4, 0 + ands r0, r1 + cmp r0, 0 + bne _080163E4 + movs r0, 0x2B + b _08016876 + .pool +_080163E4: + bl sub_800F7DC + ldrh r1, [r0, 0x8] + adds r0, r4, 0 + ands r0, r1 + movs r1, 0xCE + lsls r1, 1 + cmp r0, r1 + bne _08016408 + ldr r0, =gStringVar4 + ldr r1, =gUnknown_082EF590 + bl StringCopy + b _0801643E + .pool +_08016408: + ldr r4, =gStringVar1 + bl sub_800F7DC + ldrh r0, [r0, 0x8] + lsls r0, 22 + lsrs r0, 22 + movs r1, 0xB + muls r1, r0 + ldr r0, =gSpeciesNames + adds r1, r0 + adds r0, r4, 0 + bl StringCopy + ldr r4, =gStringVar2 + bl sub_800F7DC + ldrb r1, [r0, 0xB] + lsrs r1, 1 + adds r0, r4, 0 + movs r2, 0 + movs r3, 0x3 + bl ConvertIntToDecimalStringN + ldr r0, =gStringVar4 + ldr r1, =gUnknown_082EF564 + bl StringExpandPlaceholders +_0801643E: + ldr r1, =gStringVar4 + movs r0, 0x2C + bl sub_8015664 + b _08016878 + .pool +_0801645C: + adds r0, r6, 0 + adds r0, 0x16 + ldr r1, =gUnknown_082EF20C + bl PrintOnTextbox + lsls r0, 24 + cmp r0, 0 + bne _0801646E + b _08016878 +_0801646E: + movs r0, 0x2F + b _08016876 + .pool +_08016478: + adds r0, r6, 0 + adds r0, 0x16 + adds r1, r6, 0 + adds r1, 0x1D + adds r2, r6, 0 + adds r2, 0x1E + ldr r3, =gUnknown_082F025C + ldr r4, =gUnknown_082F027C + str r4, [sp] + bl sub_8017178 + adds r5, r0, 0 + movs r0, 0x1 + negs r0, r0 + cmp r5, r0 + bne _0801649A + b _08016878 +_0801649A: + subs r0, 0x1 + cmp r5, r0 + beq _080164A4 + cmp r5, 0x3 + bne _080164B8 +_080164A4: + movs r0, 0x4 + strb r0, [r6, 0x14] + movs r0, 0x1 + bl sub_801818C + b _08016878 + .pool +_080164B8: + cmp r5, 0x1 + beq _080164C2 + cmp r5, 0x2 + beq _080164D0 + b _08016878 +_080164C2: + ldr r1, =gUnknown_082EF4C4 + movs r0, 0x35 + bl sub_8015664 + b _08016878 + .pool +_080164D0: + ldr r1, =gUnknown_082EF298 + movs r0, 0x2F + bl sub_8015664 + b _08016878 + .pool +_080164E0: + movs r0, 0x1 + negs r0, r0 + movs r1, 0 + str r1, [sp] + movs r2, 0 + movs r3, 0x10 + bl BeginNormalPaletteFade + movs r0, 0x36 + b _08016876 +_080164F4: + ldr r0, =gPaletteFade + ldrb r1, [r0, 0x7] + movs r0, 0x80 + ands r0, r1 + cmp r0, 0 + beq _08016502 + b _08016878 +_08016502: + ldr r1, =gUnknown_02022C40 + movs r0, 0x1 + strh r0, [r1] + ldr r1, =gFieldCallback + ldr r0, =sub_80AF128 + str r0, [r1] + ldr r1, =CB2_ReturnToField + movs r0, 0x8 + bl sub_81B8904 + b _08016878 + .pool +_0801652C: + adds r0, r6, 0 + adds r0, 0x16 + adds r1, r6, 0 + adds r1, 0x1D + adds r2, r6, 0 + adds r2, 0x1E + ldr r3, =gUnknown_082F0294 + ldr r4, =gUnknown_082F032C + str r4, [sp] + bl sub_8017178 + adds r5, r0, 0 + movs r0, 0x1 + negs r0, r0 + cmp r5, r0 + bne _0801654E + b _08016878 +_0801654E: + subs r0, 0x1 + cmp r5, r0 + beq _08016558 + cmp r5, 0x12 + bne _08016580 +_08016558: + ldr r0, =gUnknown_02022C40 + bl sub_801807C + movs r0, 0 + movs r1, 0 + movs r2, 0 + bl sub_8010FCC + ldr r0, =gUnknown_082EF4FC + bl sub_801568C + b _08016878 + .pool +_08016580: + ldr r0, =gUnknown_02022C40 + strh r5, [r0, 0x2] + movs r0, 0x37 + b _08016876 + .pool +_0801658C: + ldr r2, =gUnknown_02022C40 + ldrh r0, [r2, 0x2] + ldrh r1, [r2, 0xA] + ldrh r2, [r2, 0xC] + bl sub_8010FCC + ldr r0, =gUnknown_082EF520 + bl sub_801568C + b _08016878 + .pool +_080165A8: + adds r0, r6, 0 + adds r0, 0x16 + movs r1, 0 + bl sub_80170B8 + lsls r0, 24 + asrs r1, r0, 24 + cmp r1, 0 + beq _080165CE + cmp r1, 0 + bgt _080165C8 + movs r0, 0x1 + negs r0, r0 + cmp r1, r0 + beq _080165D2 + b _08016878 +_080165C8: + cmp r1, 0x1 + beq _080165D2 + b _08016878 +_080165CE: + movs r0, 0x38 + b _08016876 +_080165D2: + movs r0, 0x1 + bl sub_801818C + movs r0, 0x4 + b _08016876 +_080165DC: + adds r0, r6, 0 + adds r0, 0x16 + ldr r1, =gUnknown_082EF5B8 + bl PrintOnTextbox + lsls r0, 24 + cmp r0, 0 + bne _080165EE + b _08016878 +_080165EE: + movs r0, 0 + movs r1, 0 + movs r2, 0 + bl sub_8010FCC + ldr r0, =gUnknown_02022C40 + bl sub_801807C + movs r0, 0x1 + bl sub_801818C + movs r0, 0x4 + b _08016876 + .pool +_08016610: + adds r0, r6, 0 + adds r0, 0x16 + ldr r1, =gUnknown_082EF1EC + bl PrintOnTextbox + lsls r0, 24 + cmp r0, 0 + bne _08016622 + b _08016878 +_08016622: + movs r0, 0x2E + b _08016876 + .pool +_0801662C: + bl sub_80173B0 + movs r0, 0x30 + b _08016876 +_08016634: + adds r0, r6, 0 + adds r0, 0x16 + adds r1, r6, 0 + adds r1, 0x1D + adds r2, r6, 0 + adds r2, 0x4A + adds r3, r6, 0 + adds r3, 0x1E + ldr r4, =gUnknown_082F034C + str r4, [sp] + ldr r4, =gUnknown_082F03A4 + str r4, [sp, 0x4] + ldr r4, [r6] + str r4, [sp, 0x8] + bl sub_80172A0 + adds r5, r0, 0 + movs r0, 0x1 + negs r0, r0 + cmp r5, r0 + bne _08016660 + b _08016878 +_08016660: + subs r0, 0x1 + cmp r5, r0 + beq _0801666A + cmp r5, 0x8 + bne _0801667C +_0801666A: + movs r0, 0x1 + bl sub_801818C + movs r0, 0x4 + b _08016876 + .pool +_0801667C: + bl sub_80173B0 + ldr r1, [r6] + lsls r4, r5, 5 + adds r1, r4 + ldrb r0, [r1, 0x9] + lsrs r0, 2 + ldrh r1, [r1, 0x8] + lsls r1, 22 + lsrs r1, 22 + bl sub_8017D04 + cmp r0, 0x1 + beq _080166C8 + cmp r0, 0x1 + bgt _080166A2 + cmp r0, 0 + beq _080166A8 + b _08016878 +_080166A2: + cmp r0, 0x2 + beq _080166FC + b _08016878 +_080166A8: + ldr r0, =gStringVar1 + ldr r1, [r6] + adds r1, r4 + bl sub_8018404 + ldr r1, =gUnknown_082EF65C + movs r0, 0x31 + bl sub_8015664 + strh r5, [r7, 0x2] + b _08016878 + .pool +_080166C8: + ldr r0, =gStringVar1 + ldr r1, [r6] + adds r1, r4 + bl sub_8018404 + ldr r0, =gStringVar2 + ldr r1, [r6] + adds r1, r4 + ldrb r2, [r1, 0x9] + lsrs r2, 2 + lsls r1, r2, 3 + subs r1, r2 + ldr r2, =gTypeNames + adds r1, r2 + bl StringCopy + ldr r1, =gUnknown_082EF6E4 + b _0801671E + .pool +_080166FC: + ldr r0, =gStringVar1 + ldr r1, [r6] + adds r1, r4 + bl sub_8018404 + ldr r0, =gStringVar2 + ldr r1, [r6] + adds r1, r4 + ldrb r2, [r1, 0x9] + lsrs r2, 2 + lsls r1, r2, 3 + subs r1, r2 + ldr r2, =gTypeNames + adds r1, r2 + bl StringCopy + ldr r1, =gUnknown_082EF718 +_0801671E: + movs r0, 0x2E + bl sub_8015664 + b _08016878 + .pool +_08016738: + adds r0, r6, 0 + adds r0, 0x16 + movs r1, 0 + bl sub_80170B8 + lsls r0, 24 + asrs r1, r0, 24 + cmp r1, 0 + beq _0801675E + cmp r1, 0 + bgt _08016758 + movs r0, 0x1 + negs r0, r0 + cmp r1, r0 + beq _08016762 + b _08016878 +_08016758: + cmp r1, 0x1 + beq _08016762 + b _08016878 +_0801675E: + movs r0, 0x32 + b _08016876 +_08016762: + movs r0, 0x1 + bl sub_801818C + movs r0, 0x4 + b _08016876 +_0801676C: + adds r0, r6, 0 + adds r0, 0x16 + ldr r1, =gUnknown_082EF4C4 + bl PrintOnTextbox + lsls r0, 24 + cmp r0, 0 + bne _0801677E + b _08016878 +_0801677E: + ldr r4, =gUnknown_02022C40 + movs r0, 0x2 + strh r0, [r4] + ldr r2, =gUnknown_02022C38 + movs r3, 0x2 + ldrsh r0, [r7, r3] + ldr r1, [r6] + lsls r0, 5 + adds r0, r1 + ldr r0, [r0] + str r0, [r2] + ldr r2, =gUnknown_02022C3E + ldr r1, [r6] + movs r3, 0x2 + ldrsh r0, [r7, r3] + lsls r0, 5 + adds r1, r0 + ldrb r0, [r1, 0x9] + lsrs r0, 2 + strb r0, [r2] + ldr r2, =gUnknown_02022C3C + ldr r1, [r6] + movs r3, 0x2 + ldrsh r0, [r7, r3] + lsls r0, 5 + adds r1, r0 + ldrh r0, [r1, 0x8] + lsls r0, 22 + lsrs r0, 22 + strh r0, [r2] + ldr r1, =gFieldCallback + ldr r0, =sub_80AF128 + str r0, [r1] + ldr r1, =CB2_ReturnToField + movs r0, 0x9 + bl sub_81B8904 + adds r0, r6, 0 + bl sub_80156B0 + ldrh r0, [r7, 0x2] + strb r0, [r4, 0x8] + b _08016878 + .pool +_080167F4: + ldr r1, =gUnknown_02022C2C + movs r0, 0x44 + strb r0, [r1] + movs r1, 0x2 + ldrsh r0, [r7, r1] + lsls r0, 5 + ldr r1, [r6] + adds r1, r0 + adds r0, r1, 0 + adds r0, 0x10 + movs r2, 0x44 + bl sub_8012188 + ldr r0, =gStringVar1 + movs r3, 0x2 + ldrsh r2, [r7, r3] + lsls r2, 5 + ldr r1, [r6] + adds r1, r2 + bl sub_8018404 + ldr r0, =gUnknown_082EE17C + ldr r0, [r0, 0x8] + bl sub_8017020 + movs r0, 0x19 + b _08016876 + .pool +_08016838: + adds r0, r6, 0 + adds r0, 0x16 + ldr r1, =gStringVar4 + bl PrintOnTextbox + lsls r0, 24 + cmp r0, 0 + beq _08016878 + movs r0, 0x1 + bl sub_801818C + movs r1, 0 + ldrsh r0, [r7, r1] + movs r2, 0x2 + ldrsh r1, [r7, r2] + ldr r2, [r6] + bl sub_801A3D0 + movs r0, 0x4 + b _08016876 + .pool +_08016864: + adds r0, r6, 0 + adds r0, 0x16 + ldr r1, =gStringVar4 + bl PrintOnTextbox + lsls r0, 24 + cmp r0, 0 + beq _08016878 + ldrb r0, [r6, 0x15] +_08016876: + strb r0, [r6, 0x14] +_08016878: + add sp, 0xC + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_80156E0 + thumb_func_start var_800D_set_xB +var_800D_set_xB: @ 8016884 + push {lr} + bl InUnionRoom + cmp r0, 0x1 + bne _08016894 + ldr r1, =gSpecialVar_Result + movs r0, 0xB + strh r0, [r1] +_08016894: + pop {r0} + bx r0 + .pool +thumb_func_end var_800D_set_xB thumb_func_start sub_801689C sub_801689C: @ 801689C diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index 6fc324f76..a654fe5f7 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -32,7 +32,7 @@ LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 21, 1, 0, 1, LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC - bg_event 23, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_294055 + bg_event 23, 5, 0, 0, 0, EventScript_PblockLink bg_event 23, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293E1E bg_event 23, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A753 bg_event 25, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A75A @@ -41,7 +41,7 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC bg_event 3, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A73E bg_event 5, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A745 bg_event 7, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A74C - bg_event 27, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293C3E + bg_event 27, 5, 0, 0, 0, EventScript_Pblock1_Ask bg_event 27, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293D4D bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 81a83c857..f694db330 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -245,7 +245,7 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4 .string "But, I don’t have any to spare today.\n" .string "Sorry about that.$" -EventScript_Pblock1_Ask: @ 8293C3E +EventScript_Pblock1_Ask:: @ 8293C3E lockall checkflag FLAG_0x340 goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB @@ -332,7 +332,7 @@ EventScript_Pblock1_NoPokeblock: @ 8293D43 releaseall end -LilycoveCity_ContestLobby_EventScript_293D4D: @ 8293D4D +LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D lockall setvar VAR_0x8009, 2 applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2 @@ -396,7 +396,7 @@ LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14 releaseall end -LilycoveCity_ContestLobby_EventScript_293E1E: @ 8293E1E +LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E lockall setvar VAR_0x8008, 15 setvar VAR_0x8009, 3 @@ -513,19 +513,19 @@ LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98 releaseall end -LilycoveCity_ContestLobby_EventScript_293FA2: @ 8293FA2 +LilycoveCity_ContestLobby_EventScript_293FA2:: @ 8293FA2 msgbox LilycoveCity_ContestLobby_Text_2937F9, 2 end -LilycoveCity_ContestLobby_EventScript_293FAB: @ 8293FAB +LilycoveCity_ContestLobby_EventScript_293FAB:: @ 8293FAB msgbox LilycoveCity_ContestLobby_Text_293842, 2 end -LilycoveCity_ContestLobby_EventScript_293FB4: @ 8293FB4 +LilycoveCity_ContestLobby_EventScript_293FB4:: @ 8293FB4 msgbox LilycoveCity_ContestLobby_Text_29388F, 2 end -LilycoveCity_ContestLobby_EventScript_293FBD: @ 8293FBD +LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD setvar VAR_0x8008, 15 goto LilycoveCity_ContestLobby_EventScript_293FC8 end @@ -576,7 +576,7 @@ LilycoveCity_ContestLobby_Movement_294053: @ 8294053 step_28 step_end -EventScript_PblockLink: @ 8294055 +EventScript_PblockLink:: @ 8294055 lockall specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 diff --git a/include/librfu.h b/include/librfu.h index dc3d336da..9d131f027 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -81,7 +81,7 @@ struct UnkLinkRfuStruct_02022B14Substruct u8 playerTrainerId[2]; }; -struct UnkLinkRfuStruct_02022B14 +struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 { struct UnkLinkRfuStruct_02022B14Substruct unk_00; u8 unk_04[4]; diff --git a/src/battle_bg.c b/src/battle_bg.c index d4bfd297a..6520438a0 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -278,7 +278,7 @@ static void sub_8035C4C(void) { if (gBattleOutcome == B_OUTCOME_WON) { - switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18) + switch (gLinkPlayers[gBattleScripting.multiplayerId].id) { case 0: BattleHandleAddTextPrinter(gText_Win, 0x16); @@ -300,7 +300,7 @@ static void sub_8035C4C(void) } else { - switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18) + switch (gLinkPlayers[gBattleScripting.multiplayerId].id) { case 0: BattleHandleAddTextPrinter(gText_Win, 0x17); @@ -323,7 +323,7 @@ static void sub_8035C4C(void) } else if (gBattleOutcome == B_OUTCOME_WON) { - if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0) + if (gLinkPlayers[gBattleScripting.multiplayerId].id != 0) { BattleHandleAddTextPrinter(gText_Win, 0x17); BattleHandleAddTextPrinter(gText_Loss, 0x16); @@ -336,7 +336,7 @@ static void sub_8035C4C(void) } else { - if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0) + if (gLinkPlayers[gBattleScripting.multiplayerId].id != 0) { BattleHandleAddTextPrinter(gText_Win, 0x16); BattleHandleAddTextPrinter(gText_Loss, 0x17); @@ -365,23 +365,23 @@ void sub_8035D74(u8 taskId) name = gLinkPlayers[i].name; linkPlayer = &gLinkPlayers[i]; - switch (linkPlayer->lp_field_18) + switch (linkPlayer->id) { case 0: BattleHandleAddTextPrinter(name, 0x11); - sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 4); + sub_8035AE4(taskId, linkPlayer->id, 1, 2, 4); break; case 1: BattleHandleAddTextPrinter(name, 0x12); - sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 4); + sub_8035AE4(taskId, linkPlayer->id, 2, 2, 4); break; case 2: BattleHandleAddTextPrinter(name, 0x13); - sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 8); + sub_8035AE4(taskId, linkPlayer->id, 1, 2, 8); break; case 3: BattleHandleAddTextPrinter(name, 0x14); - sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 8); + sub_8035AE4(taskId, linkPlayer->id, 2, 2, 8); break; } } @@ -392,7 +392,7 @@ void sub_8035D74(u8 taskId) u8 opponentId = playerId ^ BIT_SIDE; u8 opponentId_copy = opponentId; - if (gLinkPlayers[playerId].lp_field_18 != 0) + if (gLinkPlayers[playerId].id != 0) opponentId = playerId, playerId = opponentId_copy; name = gLinkPlayers[playerId].name; diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 2b918d018..9fe4b7a74 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -264,67 +264,67 @@ static void InitSinglePlayerBtlControllers(void) for (var = gUnknown_0203C7B4, i = 0; i < MAX_BATTLERS_COUNT; i++) { - switch (gLinkPlayers[i].lp_field_18) + switch (gLinkPlayers[i].id) { case 0: case 3: - sub_81B8D64(gLinkPlayers[i].lp_field_18, 0); + sub_81B8D64(gLinkPlayers[i].id, 0); break; case 1: case 2: - sub_81B8D64(gLinkPlayers[i].lp_field_18, 1); + sub_81B8D64(gLinkPlayers[i].id, 1); break; } if (i == var) { - gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer; - switch (gLinkPlayers[i].lp_field_18) + gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToRecordedPlayer; + switch (gLinkPlayers[i].id) { case 0: case 3: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0; + gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_PLAYER_LEFT; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 0; break; case 1: case 2: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3; + gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_PLAYER_RIGHT; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 3; break; } } - else if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[var].lp_field_18 & 1)) - || ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[var].lp_field_18 & 1))) + else if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[var].id & 1)) + || ((gLinkPlayers[i].id & 1) && (gLinkPlayers[var].id & 1))) { - gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer; - switch (gLinkPlayers[i].lp_field_18) + gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToRecordedPlayer; + switch (gLinkPlayers[i].id) { case 0: case 3: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0; + gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_PLAYER_LEFT; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 0; break; case 1: case 2: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3; + gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_PLAYER_RIGHT; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 3; break; } } else { - gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedOpponent; - switch (gLinkPlayers[i].lp_field_18) + gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToRecordedOpponent; + switch (gLinkPlayers[i].id) { case 0: case 3: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_LEFT; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0; + gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_OPPONENT_LEFT; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 0; break; case 1: case 2: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_RIGHT; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3; + gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_OPPONENT_RIGHT; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 3; break; } } @@ -506,69 +506,69 @@ static void InitLinkBtlControllers(void) for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - switch (gLinkPlayers[i].lp_field_18) + switch (gLinkPlayers[i].id) { case 0: case 3: - sub_81B8D64(gLinkPlayers[i].lp_field_18, 0); + sub_81B8D64(gLinkPlayers[i].id, 0); break; case 1: case 2: - sub_81B8D64(gLinkPlayers[i].lp_field_18, 1); + sub_81B8D64(gLinkPlayers[i].id, 1); break; } if (i == multiplayerId) { - gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToPlayer; - switch (gLinkPlayers[i].lp_field_18) + gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToPlayer; + switch (gLinkPlayers[i].id) { case 0: case 3: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = 0; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0; + gBattlerPositions[gLinkPlayers[i].id] = 0; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 0; break; case 1: case 2: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = 2; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3; + gBattlerPositions[gLinkPlayers[i].id] = 2; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 3; break; } } else { - if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[multiplayerId].lp_field_18 & 1)) - || ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[multiplayerId].lp_field_18 & 1))) + if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[multiplayerId].id & 1)) + || ((gLinkPlayers[i].id & 1) && (gLinkPlayers[multiplayerId].id & 1))) { - gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkPartner; - switch (gLinkPlayers[i].lp_field_18) + gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToLinkPartner; + switch (gLinkPlayers[i].id) { case 0: case 3: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = 0; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0; + gBattlerPositions[gLinkPlayers[i].id] = 0; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 0; break; case 1: case 2: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = 2; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3; + gBattlerPositions[gLinkPlayers[i].id] = 2; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 3; break; } } else { - gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkOpponent; - switch (gLinkPlayers[i].lp_field_18) + gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToLinkOpponent; + switch (gLinkPlayers[i].id) { case 0: case 3: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = 1; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0; + gBattlerPositions[gLinkPlayers[i].id] = 1; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 0; break; case 1: case 2: - gBattlerPositions[gLinkPlayers[i].lp_field_18] = 3; - gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3; + gBattlerPositions[gLinkPlayers[i].id] = 3; + gBattlerPartyIndexes[gLinkPlayers[i].id] = 3; break; } } diff --git a/src/battle_main.c b/src/battle_main.c index 8649209c0..6af44a6df 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -821,7 +821,7 @@ static void SetAllPlayersBerryData(void) for (i = 0; i < numPlayers; i++) { src = (struct BattleEnigmaBerry *)(gBlockRecvBuffer[i] + 2); - r4 = gLinkPlayers[i].lp_field_18; + r4 = gLinkPlayers[i].id; for (j = 0; j < BERRY_NAME_COUNT - 1; j++) gEnigmaBerries[r4].name[j] = src->name[j]; @@ -958,8 +958,8 @@ static void CB2_HandleStartBattle(void) if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) { - gLinkPlayers[0].lp_field_18 = 0; - gLinkPlayers[1].lp_field_18 = 1; + gLinkPlayers[0].id = 0; + gLinkPlayers[1].id = 1; } SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32); @@ -1146,10 +1146,10 @@ static void CB2_HandleStartMultiPartnerBattle(void) { u8 language; - gLinkPlayers[0].lp_field_18 = 0; - gLinkPlayers[1].lp_field_18 = 2; - gLinkPlayers[2].lp_field_18 = 1; - gLinkPlayers[3].lp_field_18 = 3; + gLinkPlayers[0].id = 0; + gLinkPlayers[1].id = 2; + gLinkPlayers[2].id = 1; + gLinkPlayers[3].id = 3; GetFrontierTrainerName(gLinkPlayers[2].name, gTrainerBattleOpponent_A); GetFrontierTrainerName(gLinkPlayers[3].name, gTrainerBattleOpponent_B); sub_8165B88(&language, gTrainerBattleOpponent_A); @@ -1207,7 +1207,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) if ((GetBlockReceivedStatus() & 3) == 3) { ResetBlockReceivedFlags(); - if (gLinkPlayers[playerMultiplayerId].lp_field_18 != 0) + if (gLinkPlayers[playerMultiplayerId].id != 0) { memcpy(gPlayerParty, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2); memcpy(gPlayerParty + 3, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon) * 2); @@ -1231,7 +1231,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) if ((GetBlockReceivedStatus() & 3) == 3) { ResetBlockReceivedFlags(); - if (gLinkPlayers[playerMultiplayerId].lp_field_18 != 0) + if (gLinkPlayers[playerMultiplayerId].id != 0) { memcpy(gPlayerParty + 2, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon)); memcpy(gPlayerParty + 5, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon)); @@ -1422,8 +1422,8 @@ static void CB2_PreInitMultiBattle(void) if (numPlayers == 4) { - if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplierId].lp_field_18 & 1)) - || (gLinkPlayers[i].lp_field_18 & 1 && gLinkPlayers[playerMultiplierId].lp_field_18 & 1)) + if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[playerMultiplierId].id & 1)) + || (gLinkPlayers[i].id & 1 && gLinkPlayers[playerMultiplierId].id & 1)) { memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct4) * 3); } @@ -1583,7 +1583,7 @@ static void CB2_HandleStartMultiBattle(void) for (id = 0; id < MAX_LINK_PLAYERS; id++) { sub_8185F90(gBlockRecvBuffer[id][1]); - switch (gLinkPlayers[id].lp_field_18) + switch (gLinkPlayers[id].id) { case 0: gTasks[var].data[3] |= gBlockRecvBuffer[id][1] & 0x3F; @@ -1620,7 +1620,7 @@ static void CB2_HandleStartMultiBattle(void) { if (id == playerMultiplayerId) { - switch (gLinkPlayers[id].lp_field_18) + switch (gLinkPlayers[id].id) { case 0: case 3: @@ -1634,10 +1634,10 @@ static void CB2_HandleStartMultiBattle(void) } else { - if ((!(gLinkPlayers[id].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplayerId].lp_field_18 & 1)) - || ((gLinkPlayers[id].lp_field_18 & 1) && (gLinkPlayers[playerMultiplayerId].lp_field_18 & 1))) + if ((!(gLinkPlayers[id].id & 1) && !(gLinkPlayers[playerMultiplayerId].id & 1)) + || ((gLinkPlayers[id].id & 1) && (gLinkPlayers[playerMultiplayerId].id & 1))) { - switch (gLinkPlayers[id].lp_field_18) + switch (gLinkPlayers[id].id) { case 0: case 3: @@ -1651,7 +1651,7 @@ static void CB2_HandleStartMultiBattle(void) } else { - switch (gLinkPlayers[id].lp_field_18) + switch (gLinkPlayers[id].id) { case 0: case 3: @@ -1683,7 +1683,7 @@ static void CB2_HandleStartMultiBattle(void) { if (id == playerMultiplayerId) { - switch (gLinkPlayers[id].lp_field_18) + switch (gLinkPlayers[id].id) { case 0: case 3: @@ -1697,10 +1697,10 @@ static void CB2_HandleStartMultiBattle(void) } else { - if ((!(gLinkPlayers[id].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplayerId].lp_field_18 & 1)) - || ((gLinkPlayers[id].lp_field_18 & 1) && (gLinkPlayers[playerMultiplayerId].lp_field_18 & 1))) + if ((!(gLinkPlayers[id].id & 1) && !(gLinkPlayers[playerMultiplayerId].id & 1)) + || ((gLinkPlayers[id].id & 1) && (gLinkPlayers[playerMultiplayerId].id & 1))) { - switch (gLinkPlayers[id].lp_field_18) + switch (gLinkPlayers[id].id) { case 0: case 3: @@ -1714,7 +1714,7 @@ static void CB2_HandleStartMultiBattle(void) } else { - switch (gLinkPlayers[id].lp_field_18) + switch (gLinkPlayers[id].id) { case 0: case 3: @@ -2088,7 +2088,7 @@ static void sub_8038B94(u8 taskId) if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - switch (gLinkPlayers[r2].lp_field_18) + switch (gLinkPlayers[r2].id) { case 0: case 2: diff --git a/src/battle_message.c b/src/battle_message.c index 1f338db92..2bdbacf99 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1843,25 +1843,25 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = text; break; case B_TXT_LINK_PLAYER_MON1_NAME: // link first player poke name - GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18]], + GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case B_TXT_LINK_OPPONENT_MON1_NAME: // link first opponent poke name - GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18 ^ 1]], + GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id ^ 1]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case B_TXT_LINK_PLAYER_MON2_NAME: // link second player poke name - GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18 ^ 2]], + GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id ^ 2]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case B_TXT_LINK_OPPONENT_MON2_NAME: // link second opponent poke name - GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18 ^ 3]], + GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id ^ 3]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; @@ -1927,7 +1927,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) } else { - if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gPotentialItemEffectBattler) + if (gLinkPlayers[gBattleScripting.multiplayerId].id == gPotentialItemEffectBattler) { StringCopy(text, gEnigmaBerries[gPotentialItemEffectBattler].name); StringAppend(text, sText_BerrySuffix); @@ -2022,13 +2022,13 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = gLinkPlayers[multiplayerID].name; break; case B_TXT_1F: // link partner name? - toCpy = gLinkPlayers[GetBattlerMultiplayerId(2 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; + toCpy = gLinkPlayers[GetBattlerMultiplayerId(2 ^ gLinkPlayers[multiplayerID].id)].name; break; case B_TXT_20: // link opponent 1 name? - toCpy = gLinkPlayers[GetBattlerMultiplayerId(1 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; + toCpy = gLinkPlayers[GetBattlerMultiplayerId(1 ^ gLinkPlayers[multiplayerID].id)].name; break; case B_TXT_21: // link opponent 2 name? - toCpy = gLinkPlayers[GetBattlerMultiplayerId(3 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; + toCpy = gLinkPlayers[GetBattlerMultiplayerId(3 ^ gLinkPlayers[multiplayerID].id)].name; break; case B_TXT_22: // link scripting active name toCpy = gLinkPlayers[GetBattlerMultiplayerId(gBattleScripting.battler)].name; @@ -2296,7 +2296,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) { if (hword == ITEM_ENIGMA_BERRY) { - if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gPotentialItemEffectBattler) + if (gLinkPlayers[gBattleScripting.multiplayerId].id == gPotentialItemEffectBattler) { StringCopy(dst, gEnigmaBerries[gPotentialItemEffectBattler].name); StringAppend(dst, sText_BerrySuffix); diff --git a/src/link.c b/src/link.c index acdb6cae0..0e8e06215 100644 --- a/src/link.c +++ b/src/link.c @@ -304,7 +304,7 @@ void LinkTestScreen(void) void sub_8009628(u8 a0) { - gLocalLinkPlayer.lp_field_18 = a0; + gLocalLinkPlayer.id = a0; } static void InitLocalLinkPlayer(void) diff --git a/src/pokemon.c b/src/pokemon.c index 800b7c0cd..5bff1f2d3 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1752,7 +1752,7 @@ bool8 sub_80688F8(u8 caseId, u8 battlerId) return FALSE; if (!gMain.inBattle) return FALSE; - if (gLinkPlayers[GetMultiplayerId()].lp_field_18 == battlerId) + if (gLinkPlayers[GetMultiplayerId()].id == battlerId) return FALSE; break; case 2: @@ -1774,7 +1774,7 @@ bool8 sub_80688F8(u8 caseId, u8 battlerId) return FALSE; if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - if (gLinkPlayers[GetMultiplayerId()].lp_field_18 == battlerId) + if (gLinkPlayers[GetMultiplayerId()].id == battlerId) return FALSE; } else @@ -4805,7 +4805,7 @@ void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies) bool8 sub_806D7EC(void) { bool8 retVal = FALSE; - switch (gLinkPlayers[GetMultiplayerId()].lp_field_18) + switch (gLinkPlayers[GetMultiplayerId()].id) { case 0: case 3: @@ -4822,7 +4822,7 @@ bool8 sub_806D7EC(void) bool16 sub_806D82C(u8 id) { bool16 retVal = FALSE; - switch (gLinkPlayers[id].lp_field_18) + switch (gLinkPlayers[id].id) { case 0: case 3: @@ -4840,7 +4840,7 @@ s32 GetBattlerMultiplayerId(u16 a1) { s32 id; for (id = 0; id < MAX_LINK_PLAYERS; id++) - if (gLinkPlayers[id].lp_field_18 == a1) + if (gLinkPlayers[id].id == a1) break; return id; } @@ -5691,7 +5691,7 @@ const u8 *GetTrainerPartnerName(void) else { u8 id = GetMultiplayerId(); - return gLinkPlayers[GetBattlerMultiplayerId(gLinkPlayers[id].lp_field_18 ^ 2)].name; + return gLinkPlayers[GetBattlerMultiplayerId(gLinkPlayers[id].id ^ 2)].name; } } @@ -5821,7 +5821,7 @@ u8 sub_806EF08(u8 arg0) s32 i; s32 var = 0; u8 multiplayerId = GetMultiplayerId(); - switch (gLinkPlayers[multiplayerId].lp_field_18) + switch (gLinkPlayers[multiplayerId].id) { case 0: case 2: @@ -5834,7 +5834,7 @@ u8 sub_806EF08(u8 arg0) } for (i = 0; i < 4; i++) { - if (gLinkPlayers[i].lp_field_18 == (s16)(var)) + if (gLinkPlayers[i].id == (s16)(var)) break; } return i; @@ -5844,7 +5844,7 @@ u8 sub_806EF84(u8 arg0, u8 arg1) { s32 i; s32 var = 0; - switch (gLinkPlayers[arg1].lp_field_18) + switch (gLinkPlayers[arg1].id) { case 0: case 2: @@ -5857,7 +5857,7 @@ u8 sub_806EF84(u8 arg0, u8 arg1) } for (i = 0; i < 4; i++) { - if (gLinkPlayers[i].lp_field_18 == (s16)(var)) + if (gLinkPlayers[i].id == (s16)(var)) break; } return i; diff --git a/src/recorded_battle.c b/src/recorded_battle.c index eb48ab15a..1eed9aec7 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -159,7 +159,7 @@ void sub_8184E58(void) { sRecordedBattle_Players[i].trainerId = gLinkPlayers[i].trainerId; sRecordedBattle_Players[i].gender = gLinkPlayers[i].gender; - sRecordedBattle_Players[i].battlerId = gLinkPlayers[i].lp_field_18; + sRecordedBattle_Players[i].battlerId = gLinkPlayers[i].id; sRecordedBattle_Players[i].language = gLinkPlayers[i].language; if (i < linkPlayersCount) @@ -1340,7 +1340,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) } gLinkPlayers[i].gender = src->playersGender[i]; gLinkPlayers[i].language = src->playersLanguage[i]; - gLinkPlayers[i].lp_field_18 = src->playersBattlers[i]; + gLinkPlayers[i].id = src->playersBattlers[i]; gLinkPlayers[i].trainerId = src->playersTrainerId[i]; if (var) @@ -1453,7 +1453,7 @@ u8 GetActiveBattlerLinkPlayerGender(void) for (i = 0; i < MAX_LINK_PLAYERS; i++) { - if (gLinkPlayers[i].lp_field_18 == gActiveBattler) + if (gLinkPlayers[i].id == gActiveBattler) break; } diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 81aef45c6..0a751a9f5 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -38,6 +38,7 @@ extern void HealPlayerParty(void); struct UnkStruct_Shared { struct UnkLinkRfuStruct_02022B14 field_0; + u8 needingPadding[3]; u8 playerName[PLAYER_NAME_LENGTH]; }; @@ -2508,6 +2509,8 @@ void sub_80156C8(struct UnkStruct_URoom *data) memcpy(data->field_0, &gDecompressionBuffer[0x3F00], 0x100); } +// Cannot match, please fix later. +/* void sub_80156E0(u8 taskId) { u32 id = 0; @@ -3257,3 +3260,5 @@ void var_800D_set_xB(void) if (InUnionRoom() == TRUE) gSpecialVar_Result = 11; } + +*/ -- cgit v1.2.3