diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/anim/flying.c | 2245 | ||||
| -rw-r--r-- | src/battle/battle_4.c | 167 | ||||
| -rw-r--r-- | src/birch_pc.c | 10 | ||||
| -rw-r--r-- | src/data/field_event_obj/berry_tree_graphics_tables.h | 540 | ||||
| -rw-r--r-- | src/data/field_event_obj/event_object_graphics.h | 1358 | ||||
| -rw-r--r-- | src/data/field_event_obj/event_object_pic_tables.h | 2590 | ||||
| -rw-r--r-- | src/data/field_event_obj/field_effect_object_graphics.h | 157 | ||||
| -rw-r--r-- | src/data/field_event_obj/field_effect_objects.h | 278 | ||||
| -rw-r--r-- | src/data/pokedex_orders.h | 3188 | ||||
| -rw-r--r-- | src/debug/sound_check_menu.c | 26 | ||||
| -rw-r--r-- | src/field_camera.c | 6 | ||||
| -rw-r--r-- | src/fieldmap.c | 26 | ||||
| -rw-r--r-- | src/item_menu.c | 292 | ||||
| -rw-r--r-- | src/libs/m4a_tables.c | 2 | ||||
| -rw-r--r-- | src/pokedex.c | 9 | ||||
| -rw-r--r-- | src/pokemon_3.c | 15 | ||||
| -rw-r--r-- | src/pokenav_before.c | 603 | ||||
| -rw-r--r-- | src/sound.c | 19 | ||||
| -rw-r--r-- | src/use_pokeblock.c | 2 |
19 files changed, 6339 insertions, 5194 deletions
diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 35022db1f..5c2f3a357 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -4,11 +4,16 @@ #include "palette.h" #include "rom_8077ABC.h" #include "trig.h" +#include "main.h" +#include "random.h" extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; extern u8 gAnimVisualTaskCount; +extern struct OamMatrix gOamMatrices[]; +extern u8 gBanksBySide[]; +extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538; void sub_80785E4(struct Sprite *sprite); void sub_80DA034(struct Sprite *sprite); @@ -21,16 +26,24 @@ void sub_80DA348(struct Sprite *sprite); void sub_80DA38C(struct Sprite *sprite); void sub_80DA4D8(struct Sprite *sprite); void sub_80DA410(struct Sprite *sprite); +void sub_80DA6F0(struct Sprite *sprite); void sub_80DAD30(struct Sprite *sprite); void sub_80DAD84(struct Sprite *sprite); +void sub_80DAF0C(struct Sprite *sprite); void sub_80DB000(struct Sprite *sprite); +void sub_80DB0A0(struct Sprite *sprite); void sub_80DB194(struct Sprite *sprite); void sub_80DB1F4(struct Sprite *sprite); void sub_80DB288(struct Sprite *sprite); +void sub_80DB2D0(struct Sprite *sprite); +void sub_80DB330(struct Sprite *sprite); void sub_80DB374(struct Sprite *sprite); void sub_80DB458(struct Sprite *sprite); +void sub_80DB508(struct Sprite *sprite); void sub_80DB564(struct Sprite *sprite); +void sub_80DB578(struct Sprite *sprite); void sub_80DB5E4(struct Sprite *sprite); +void sub_80DB6A0(struct Sprite *sprite); void sub_80DA0DC(u8 taskId); @@ -104,7 +117,7 @@ const union AffineAnimCmd gSpriteAffineAnim_83DA3FC[] = const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA424[] = { - gSpriteAffineAnim_83DA3FC, + gSpriteAffineAnim_83DA3FC, }; const union AffineAnimCmd gSpriteAffineAnim_83DA428[] = @@ -356,7 +369,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA65C = .callback = sub_80DB5E4, }; -void sub_80DA034(struct Sprite *sprite) +void sub_80DA034(struct Sprite *sprite) { sub_8078764(sprite, 0); sprite->pos1.y += 20; @@ -365,18 +378,16 @@ void sub_80DA034(struct Sprite *sprite) sub_80DA05C(sprite); } -void sub_80DA05C(struct Sprite *sprite) -{ +void sub_80DA05C(struct Sprite *sprite) { sprite->pos2.x = Sin(sprite->data[1], 0x20); sprite->pos2.y = Cos(sprite->data[1], 0x8); sprite->data[1] = (sprite->data[1] + 5) & 0xFF; - if(++sprite->data[0] == 0x47) - { + if (++sprite->data[0] == 0x47) { DestroyAnimSprite(sprite); } } -void sub_80DA09C(u8 taskId) +void sub_80DA09C(u8 taskId) { gTasks[taskId].data[0] = gBattleAnimArgs[1]; gTasks[taskId].data[1] = gBattleAnimArgs[0]; @@ -384,113 +395,45 @@ void sub_80DA09C(u8 taskId) gTasks[taskId].func = sub_80DA0DC; } -#ifdef NONMATCHING void sub_80DA0DC(u8 taskId) { - gTasks[taskId].data[10]++; - if(gTasks[taskId].data[10] == gTasks[taskId].data[1]) + u8 data2; + u16 temp; + int i, base; + + if (gTasks[taskId].data[10]++ == gTasks[taskId].data[1]) { - u16 r0; - u16 r2; - s32 i; - gTasks[taskId].data[10] = 0; - r0 = gTasks[taskId].data[2]; - r2 = gPlttBufferFaded[r0 * 8]; - for(i = 0; i < 8; i++) - gPlttBufferFaded[r0 * 8 + i + 0x107] = gPlttBufferFaded[r0 * 8 + i + 0x107]; - gTasks[taskId].data[2] = ((r0 + 0x101) * 2) + r2; + + data2 = gTasks[taskId].data[2]; + temp = gPlttBufferFaded[16 * data2 + 0x108]; + + i = 7; + base = data2 * 16; + + do + { + gPlttBufferFaded[base + 0x101 + i] = gPlttBufferFaded[base + 0x100 + i]; + i--; + } + while (i > 0); + + gPlttBufferFaded[base + 0x101] = temp; } - gTasks[taskId].data[0] = gTasks[taskId].data[0] * 32; - if(gTasks[taskId].data[0] == 0) + + if (--gTasks[taskId].data[0] == 0) { DestroyAnimVisualTask(taskId); } } -#else -NAKED -void sub_80DA0DC(u8 taskId) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - ldr r2, _080DA15C @ =gTasks\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 3\n\ - adds r3, r0, r2\n\ - ldrh r0, [r3, 0x1C]\n\ - adds r1, r0, 0x1\n\ - strh r1, [r3, 0x1C]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r4, 0xA\n\ - ldrsh r1, [r3, r4]\n\ - adds r7, r2, 0\n\ - cmp r0, r1\n\ - bne _080DA13A\n\ - movs r0, 0\n\ - strh r0, [r3, 0x1C]\n\ - ldrb r0, [r3, 0xC]\n\ - ldr r2, _080DA160 @ =gPlttBufferFaded\n\ - lsls r0, 4\n\ - movs r3, 0x84\n\ - lsls r3, 1\n\ - adds r1, r0, r3\n\ - lsls r1, 1\n\ - adds r1, r2\n\ - ldrh r6, [r1]\n\ - movs r4, 0x7\n\ - mov r12, r0\n\ - ldr r0, _080DA164 @ =0x00000107\n\ - add r0, r12\n\ - lsls r0, 1\n\ - adds r3, r0, r2\n\ -_080DA122:\n\ - ldrh r0, [r3]\n\ - strh r0, [r1]\n\ - subs r3, 0x2\n\ - subs r1, 0x2\n\ - subs r4, 0x1\n\ - cmp r4, 0\n\ - bgt _080DA122\n\ - ldr r0, _080DA168 @ =0x00000101\n\ - add r0, r12\n\ - lsls r0, 1\n\ - adds r0, r2\n\ - strh r6, [r0]\n\ -_080DA13A:\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 3\n\ - adds r0, r7\n\ - ldrh r1, [r0, 0x8]\n\ - subs r1, 0x1\n\ - strh r1, [r0, 0x8]\n\ - lsls r1, 16\n\ - cmp r1, 0\n\ - bne _080DA154\n\ - adds r0, r5, 0\n\ - bl DestroyAnimVisualTask\n\ -_080DA154:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080DA15C: .4byte gTasks\n\ -_080DA160: .4byte gPlttBufferFaded\n\ -_080DA164: .4byte 0x00000107\n\ -_080DA168: .4byte 0x00000101\n\ - .syntax divided\n"); -} -#endif void sub_80DA16C(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + } sprite->data[0] = gBattleAnimArgs[4]; sprite->data[1] = sprite->pos1.x; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; @@ -605,14 +548,14 @@ void sub_80DA410(struct Sprite *sprite) sprite->data[0] = 1; TranslateAnimLinear(sprite); - if (((u16)sprite->data[3] >> 8) > 200) + if (((u16) sprite->data[3] >> 8) > 200) { sprite->pos1.x += sprite->pos2.x; sprite->pos2.x = 0; sprite->data[3] &= 0xFF; } - if ((u32)(sprite->pos1.x + sprite->pos2.x + 32) > 304 || sprite->pos1.y + sprite->pos2.y > 160) + if ((u32) (sprite->pos1.x + sprite->pos2.x + 32) > 304 || sprite->pos1.y + sprite->pos2.y > 160) { gSprites[GetAnimBattlerSpriteId(0)].invisible = 0; DestroyAnimSprite(sprite); @@ -628,8 +571,2106 @@ void sub_80DA48C(struct Sprite *sprite) FreeOamMatrix(sprite->oam.matrixNum); sprite->oam.affineMode = 0; } - + DestroySprite(sprite); gAnimVisualTaskCount--; } } + +// FAKEMATCHING +void sub_80DA4D8(struct Sprite *sprite) +{ + s16 *data; + u8 slot; + s16 spriteCoord; + int t1, t2; + u32 arg2; + u32 matrixNum; + u8 sinIndex; + register s16 sinVal asm ("r4"); + register int sinVal2 asm ("r0"); + + data = sprite->data; + + if (gBattleAnimArgs[7] & 0x100) + { + slot = gAnimBankAttacker; + } + else + { + slot = gAnimBankTarget; + } + + if (GetBattlerSide(slot) == 0) + { + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + } + + sprite->pos1.x = GetBattlerSpriteCoord(slot, 0) + gBattleAnimArgs[0]; + spriteCoord = GetBattlerSpriteCoord(slot, 1); + sprite->pos1.y = spriteCoord + gBattleAnimArgs[1]; + data[4] = sprite->pos1.y << 8; + + t1 = (spriteCoord + (u16) gBattleAnimArgs[6]) << 1; + data[7] = (data[7] & 1) | t1; + ((u8 *) data)[0] |= 4; + + arg2 = (u16) gBattleAnimArgs[2]; + data[1] = (u8) gBattleAnimArgs[2]; + arg2 <<= 16; + data[5] = arg2 >> 24; + data[2] = gBattleAnimArgs[3]; + data[3] = gBattleAnimArgs[4]; + data[6] = gBattleAnimArgs[5]; + + if ((u16) (data[1] - 64) <= 0x7f) + { + if (gMain.inBattle) + { + sprite->oam.priority = sub_8079ED4(slot) + 1; + } + else + { + sprite->oam.priority = sub_8079ED4(slot); + } + + ((u8 *) data)[14] = data[7] & -2; + + if (!(data[2] & 0x8000)) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + + sprite->animBeginning = 1; + sprite->animEnded = 0; + } + } + else + { + sprite->oam.priority = sub_8079ED4(slot); + ((u8 *) data)[14] |= 1; + + if (data[2] & 0x8000) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + + sprite->animBeginning = 1; + sprite->animEnded = 0; + } + } + + t2 = (u16) data[1] >> 6 << 4; + ((u8 *) data)[0] = (15 & data[0]) | t2; + + sprite->pos2.x = (gSineTable[(u16) data[1]] * (u8) data[6]) >> 8; + + matrixNum = sprite->oam.matrixNum; + + sinIndex = (-sprite->pos2.x >> 1) + data[5]; + sinVal = gSineTable[sinIndex]; + + gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; + gOamMatrices[matrixNum].b = sinVal; + sinVal2 = -sinVal; + gOamMatrices[matrixNum].c = sinVal2; + + sprite->callback = sub_80DA6F0; +} + +#ifdef NONMATCHING +void sub_80DA6F0(struct Sprite * sprite) +{ + // (Probably) Functionally equivalent + + struct dataStruct { + u8 one:1; + u8 two:1; + u8 three:1; + u8 four:1; + u8 fiveeight:4; + }; + + u8 zero; + s16 * data; + u8 * dataByte; + + u16 r8; + u32 matrixNum; + u8 sinIndex; + s16 sinVal; + + zero = 0; + data = sprite->data; + dataByte = (u8 *)data; + + if (dataByte[0] & 1) + { + u32 t1; + + t1 = dataByte[1]; + dataByte[1] += 0xff; + + t1 <<= 24; + if (t1 == 0) + { + // 080da724 + ((struct dataStruct *)dataByte)[0].one = 0; + dataByte[1] = zero; + } + + } + else + { + // 080da730 + u16 tData; + u16 t2; + + tData = data[1]; + t2 = tData >> 6; + r8 = tData; + + switch (t2) + { + case (0): + // 080da756 + + if (dataByte[0] >> 4 == 1) + { + dataByte[0] |= 8; + dataByte[0] |= 1; + dataByte[1] = zero; + } + else if (dataByte[0] >> 4 == 3) + { + /*080da76c*/ + ((struct dataStruct *)dataByte)[0].two ^= 1; + ((struct dataStruct *)dataByte)[0].one = 1; + dataByte[1] = zero; + } + else + { + // 080da790 + if (dataByte[0] & 8) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if ((dataByte)[0] & 4) + { + u8 b; + if (gMain.inBattle) + { + if (!(dataByte[14] & 1)) + { + sprite->oam.priority -= 1; + } + else + { + // 080da814 + sprite->oam.priority += 1; + } + } + else + { + // 080da82e + if (!(dataByte[14] & 1)) + { + sprite->subpriority -= 12; + } + else + { + // 080da85c + sprite->subpriority += 12; + } + } + b = (((u32)(dataByte[14] << 31) >> 31) ^ 1) & 1; + dataByte[14] = (dataByte[14] & -2) | b; + } + // 080da87a + ((struct dataStruct *)dataByte)[0].four = 0; + r8 = data[1]; + } + } + + // 080da88a + dataByte[0] &= 15; + // 080dac52 + break; + case (1): + // 080da896 + if (dataByte[0] >> 4 == 0) + { + dataByte[0] |= 8; + dataByte[0] |= 1; + dataByte[1] = zero; + } + else/*080da8ac*/if (dataByte[0] >> 4 == 2) + { + dataByte[0] |= 1; + dataByte[1] = zero; + } + else + { + // 080da8be + if (dataByte[0] & 8) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if (dataByte[0] & 4) + { + u8 b; + if (gMain.inBattle) + { + if (!(dataByte[14] & 1)) + { + sprite->oam.priority -= 1; + } + else + { + // 080da948 + sprite->oam.priority += 1; + } + } + else + { + // 080da962 + if (!(dataByte[14] & 1)) + { + sprite->subpriority -=12; + } + else + { + // 080da98c + sprite->subpriority += 12; + } + } + // 080da978 + 080da996 + b = (((u32)(dataByte[14] << 31) >> 31) ^ 1) & 1; + dataByte[14] = (dataByte[14] & -2) | b; + } + // 080da9ac + ((struct dataStruct *)dataByte)[0].four = 0; + r8 = data[1]; + } + } + // 080da9bc + dataByte[0] &= 15; + dataByte[0] |= 16; + // 080dac52 + break; + case (2): + // 080da9c8 + if (dataByte[0] >> 4 == 3) + { + dataByte[0] |= 8; + dataByte[0] |= 1; + dataByte[1] = zero; + } + else/*080da9de*/if (dataByte[0] >> 4 == 1) + { + dataByte[0] |= 1; + dataByte[1] = zero; + } + else + { + // 080da9f0 + if (dataByte[0] & 8) + { + // 080da9fa + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if (dataByte[0] & 4) + { + u8 b; + if (gMain.inBattle) + { + if (!(dataByte[14] & 1)) + { + sprite->oam.priority -= 1; + } + else + { + // 080daa74 + sprite->oam.priority += 1; + } + } + else + { + // 080daaa4 + if (!(dataByte[14] & 1)) + { + sprite->subpriority -= 12; + } + else + { + // 080daace + sprite->subpriority += 12; + } + } + b = (((u32)(dataByte[14] << 31) >> 31) ^ 1) & 1; + dataByte[14] = (dataByte[14] & -2) | b; + } + // 080daaec + ((struct dataStruct *)dataByte)[0].four = 0; + r8 = data[1]; + } + } + // 080daafe + dataByte[0] &= 15; + dataByte[0] |= 32; + // 080dac52 + break; + case (3): + // 080dab0e + if (dataByte[0] >> 4 == 2) + { + dataByte[0] |= 8; + // 080dac42 + } + else/*080dab20*/if (dataByte[0] >> 4 == 0) + { + ((struct dataStruct *)dataByte)[0].two ^= 1; + ((struct dataStruct *)dataByte)[0].one = 1; + dataByte[1] = zero; + // 080dac42 + } + else + { + // 080dab44 + if (dataByte[0] & 8) + { + sprite->hFlip ^= 1; + sprite->animNum = sprite->hFlip; + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if (dataByte[0] & 4) + { + u8 b; + if (gMain.inBattle) + { + if (!(dataByte[14] & 1)) + { + sprite->oam.priority -= 1; + } + else + { + // 080dabcc + sprite->oam.priority += 1; + } + } + else + { + // 080dabe6 + if (!(dataByte[14] & 1)) + { + sprite->subpriority -= 12; + } + else + { + // 080dac14 + sprite->subpriority += 12; + } + } + // 080dac00 + 080dac1e + b = (((u32)(dataByte[14]) << 31 >> 31) ^ 1) & 1; + dataByte[14] = (-2 & dataByte[14]) | b; + } + // 080dac32 + ((struct dataStruct *)dataByte)[0].four = 0; + r8 = data[1]; + } + } + // 080dac42 + dataByte[0] &= 15; + dataByte[0] |= 48; + break; + } + + // 080dac52 + + sprite->pos2.x = (dataByte[12 + ((struct dataStruct *)dataByte)[0].two] * gSineTable[r8]) >> 8; + + matrixNum = sprite->oam.matrixNum; + + sinIndex = (-sprite->pos2.x >> 1) + dataByte[10]; + sinVal = gSineTable[sinIndex]; + + gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; + gOamMatrices[matrixNum].b = sinVal; + gOamMatrices[matrixNum].c = -sinVal; + + data[4] += data[3]; + + sprite->pos1.y = (u16)data[4] >> 8; + + if (data[2] & (0x80 << 8)) + { + data[1] = (data[1] - (data[2] & ((0x80 << 8) - 1))) & 0xff; + } + else + { + // 080dace8 + data[1] = ((data[2] & 0x7fff) + data[1]) & 0xff; + } + // 080dacfe + if (sprite->pos1.y + sprite->pos2.y >= (u16)data[7] / 2) + { + sprite->data[0] = 0; + sprite->callback = sub_80DA48C; + } + } +} +#else +NAKED +void sub_80DA6F0(struct Sprite *sprite) +{ + asm_unified("push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + adds r5, r0, 0\n\ + movs r6, 0\n\ + movs r0, 0x2E\n\ + adds r0, r5\n\ + mov r12, r0\n\ + ldrb r2, [r0]\n\ + movs r7, 0x1\n\ + movs r1, 0x1\n\ + mov r9, r1\n\ + mov r0, r9\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _080DA730\n\ + mov r3, r12\n\ + ldrb r0, [r3, 0x1]\n\ + adds r1, r0, 0\n\ + adds r1, 0xFF\n\ + strb r1, [r3, 0x1]\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080DA724\n\ + b _080DAD1A\n\ +_080DA724:\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + ands r0, r2\n\ + strb r0, [r3]\n\ + strb r6, [r3, 0x1]\n\ + b _080DAD1A\n\ +_080DA730:\n\ + mov r4, r12\n\ + ldrh r0, [r4, 0x2]\n\ + lsrs r4, r0, 6\n\ + mov r8, r0\n\ + cmp r4, 0x1\n\ + bne _080DA73E\n\ + b _080DA896\n\ +_080DA73E:\n\ + cmp r4, 0x1\n\ + bgt _080DA748\n\ + cmp r4, 0\n\ + beq _080DA756\n\ + b _080DAC52\n\ +_080DA748:\n\ + cmp r4, 0x2\n\ + bne _080DA74E\n\ + b _080DA9C8\n\ +_080DA74E:\n\ + cmp r4, 0x3\n\ + bne _080DA754\n\ + b _080DAB0E\n\ +_080DA754:\n\ + b _080DAC52\n\ +_080DA756:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x1\n\ + bne _080DA76C\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + orrs r0, r7\n\ + mov r1, r12\n\ + strb r0, [r1]\n\ + strb r6, [r1, 0x1]\n\ + b _080DA88A\n\ +_080DA76C:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x3\n\ + bne _080DA790\n\ + lsls r0, r2, 30\n\ + lsrs r0, 31\n\ + movs r1, 0x1\n\ + eors r0, r1\n\ + ands r0, r7\n\ + lsls r0, 1\n\ + movs r1, 0x3\n\ + negs r1, r1\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + orrs r1, r7\n\ + mov r2, r12\n\ + strb r1, [r2]\n\ + strb r6, [r2, 0x1]\n\ + b _080DA88A\n\ +_080DA790:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _080DA88A\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r4, 0x1\n\ + eors r1, r4\n\ + ands r1, r7\n\ + movs r6, 0x2\n\ + negs r6, r6\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + mov r3, r12\n\ + ldrb r1, [r3]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DA87A\n\ + ldr r0, _080DA80C @ =gMain\n\ + ldr r1, _080DA810 @ =0x0000043d\n\ + adds r0, r1\n\ + ldrb r1, [r0]\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DA82E\n\ + ldrb r1, [r3, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DA814\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DA868\n\ + .align 2, 0\n\ +_080DA80C: .4byte gMain\n\ +_080DA810: .4byte 0x0000043d\n\ +_080DA814:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DA866\n\ +_080DA82E:\n\ + mov r0, r12\n\ + ldrb r1, [r0, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DA85C\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + strb r0, [r1]\n\ + mov r1, r12\n\ + ldrb r2, [r1, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2, 0xE]\n\ + b _080DA87A\n\ +_080DA85C:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ + strb r0, [r1]\n\ +_080DA866:\n\ + mov r3, r12\n\ +_080DA868:\n\ + ldrb r2, [r3, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r3, 0xE]\n\ +_080DA87A:\n\ + mov r4, r12\n\ + ldrb r1, [r4]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r4]\n\ + ldrh r0, [r4, 0x2]\n\ + mov r8, r0\n\ +_080DA88A:\n\ + mov r2, r12\n\ + ldrb r1, [r2]\n\ + movs r0, 0xF\n\ + ands r0, r1\n\ + strb r0, [r2]\n\ + b _080DAC52\n\ +_080DA896:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0\n\ + bne _080DA8AC\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + orrs r0, r7\n\ + mov r3, r12\n\ + strb r0, [r3]\n\ + strb r6, [r3, 0x1]\n\ + b _080DA9BC\n\ +_080DA8AC:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x2\n\ + bne _080DA8BE\n\ + adds r0, r2, 0\n\ + orrs r0, r7\n\ + mov r4, r12\n\ + strb r0, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _080DA9BC\n\ +_080DA8BE:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _080DA9BC\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r4, 0x1\n\ + eors r1, r4\n\ + ands r1, r7\n\ + movs r6, 0x2\n\ + negs r6, r6\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + mov r0, r12\n\ + ldrb r1, [r0]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DA9AC\n\ + ldr r0, _080DA940 @ =gMain\n\ + ldr r1, _080DA944 @ =0x0000043d\n\ + adds r0, r1\n\ + ldrb r1, [r0]\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DA962\n\ + mov r2, r12\n\ + ldrb r1, [r2, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DA948\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + mov r3, r12\n\ + b _080DA978\n\ + .align 2, 0\n\ +_080DA940: .4byte gMain\n\ +_080DA944: .4byte 0x0000043d\n\ +_080DA948:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DA996\n\ +_080DA962:\n\ + mov r3, r12\n\ + ldrb r1, [r3, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DA98C\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + strb r0, [r1]\n\ +_080DA978:\n\ + ldrb r2, [r3, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r3, 0xE]\n\ + b _080DA9AC\n\ +_080DA98C:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ + strb r0, [r1]\n\ +_080DA996:\n\ + mov r0, r12\n\ + ldrb r2, [r0, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2, 0xE]\n\ +_080DA9AC:\n\ + mov r3, r12\n\ + ldrb r1, [r3]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + ldrh r4, [r3, 0x2]\n\ + mov r8, r4\n\ +_080DA9BC:\n\ + mov r1, r12\n\ + ldrb r0, [r1]\n\ + movs r1, 0xF\n\ + ands r1, r0\n\ + movs r0, 0x10\n\ + b _080DAC4C\n\ +_080DA9C8:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x3\n\ + bne _080DA9DE\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + orrs r0, r7\n\ + mov r3, r12\n\ + strb r0, [r3]\n\ + strb r6, [r3, 0x1]\n\ + b _080DAAFE\n\ +_080DA9DE:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x1\n\ + bne _080DA9F0\n\ + adds r0, r2, 0\n\ + orrs r0, r7\n\ + mov r4, r12\n\ + strb r0, [r4]\n\ + strb r6, [r4, 0x1]\n\ + b _080DAAFE\n\ +_080DA9F0:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _080DA9FA\n\ + b _080DAAFE\n\ +_080DA9FA:\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r6, 0x1\n\ + eors r1, r6\n\ + ands r1, r7\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + mov r8, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + mov r2, r12\n\ + ldrb r1, [r2]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DAAEC\n\ + ldr r0, _080DAA6C @ =gMain\n\ + ldr r3, _080DAA70 @ =0x0000043d\n\ + adds r0, r3\n\ + ldrb r0, [r0]\n\ + ands r4, r0\n\ + cmp r4, 0\n\ + beq _080DAAA4\n\ + ldrb r1, [r2, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DAA74\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DAAD8\n\ + .align 2, 0\n\ +_080DAA6C: .4byte gMain\n\ +_080DAA70: .4byte 0x0000043d\n\ +_080DAA74:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + mov r0, r12\n\ + ldrb r2, [r0, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2, 0xE]\n\ + b _080DAAEC\n\ +_080DAAA4:\n\ + mov r3, r12\n\ + ldrb r1, [r3, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DAACE\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + strb r0, [r1]\n\ + ldrb r2, [r3, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r3, 0xE]\n\ + b _080DAAEC\n\ +_080DAACE:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ + strb r0, [r1]\n\ +_080DAAD8:\n\ + mov r4, r12\n\ + ldrb r2, [r4, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r6\n\ + ands r0, r7\n\ + mov r1, r8\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r4, 0xE]\n\ +_080DAAEC:\n\ + mov r0, r12\n\ + ldrb r1, [r0]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + mov r1, r12\n\ + strb r0, [r1]\n\ + ldrh r2, [r1, 0x2]\n\ + mov r8, r2\n\ +_080DAAFE:\n\ + mov r3, r12\n\ + ldrb r0, [r3]\n\ + movs r1, 0xF\n\ + ands r1, r0\n\ + movs r0, 0x20\n\ + orrs r1, r0\n\ + strb r1, [r3]\n\ + b _080DAC52\n\ +_080DAB0E:\n\ + lsls r1, r2, 24\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0x2\n\ + bne _080DAB20\n\ + movs r0, 0x8\n\ + orrs r0, r2\n\ + mov r4, r12\n\ + strb r0, [r4]\n\ + b _080DAC42\n\ +_080DAB20:\n\ + lsrs r0, r1, 28\n\ + cmp r0, 0\n\ + bne _080DAB44\n\ + lsls r0, r2, 30\n\ + lsrs r0, 31\n\ + movs r1, 0x1\n\ + eors r0, r1\n\ + ands r0, r7\n\ + lsls r0, 1\n\ + movs r1, 0x3\n\ + negs r1, r1\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + orrs r1, r7\n\ + mov r0, r12\n\ + strb r1, [r0]\n\ + strb r6, [r0, 0x1]\n\ + b _080DAC42\n\ +_080DAB44:\n\ + movs r0, 0x8\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _080DAC42\n\ + adds r3, r5, 0\n\ + adds r3, 0x3F\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 31\n\ + lsrs r1, 31\n\ + movs r4, 0x1\n\ + eors r1, r4\n\ + ands r1, r7\n\ + movs r6, 0x2\n\ + negs r6, r6\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r3]\n\ + lsls r0, 31\n\ + lsrs r0, 31\n\ + adds r1, r5, 0\n\ + adds r1, 0x2A\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + movs r1, 0x4\n\ + orrs r0, r1\n\ + movs r1, 0x11\n\ + negs r1, r1\n\ + ands r0, r1\n\ + strb r0, [r3]\n\ + mov r2, r12\n\ + ldrb r1, [r2]\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DAC32\n\ + ldr r0, _080DABC4 @ =gMain\n\ + ldr r3, _080DABC8 @ =0x0000043d\n\ + adds r0, r3\n\ + ldrb r1, [r0]\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DABE6\n\ + ldrb r1, [r2, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DABCC\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + subs r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + mov r0, r12\n\ + ldrb r2, [r0, 0xE]\n\ + b _080DAC00\n\ + .align 2, 0\n\ +_080DABC4: .4byte gMain\n\ +_080DABC8: .4byte 0x0000043d\n\ +_080DABCC:\n\ + ldrb r2, [r5, 0x5]\n\ + lsls r1, r2, 28\n\ + lsrs r1, 30\n\ + adds r1, 0x1\n\ + movs r0, 0x3\n\ + ands r1, r0\n\ + lsls r1, 2\n\ + movs r0, 0xD\n\ + negs r0, r0\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x5]\n\ + b _080DAC1E\n\ +_080DABE6:\n\ + mov r0, r12\n\ + ldrb r1, [r0, 0xE]\n\ + mov r0, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080DAC14\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + subs r0, 0xC\n\ + strb r0, [r1]\n\ + mov r1, r12\n\ + ldrb r2, [r1, 0xE]\n\ +_080DAC00:\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2, 0xE]\n\ + b _080DAC32\n\ +_080DAC14:\n\ + adds r1, r5, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0xC\n\ + strb r0, [r1]\n\ +_080DAC1E:\n\ + mov r3, r12\n\ + ldrb r2, [r3, 0xE]\n\ + lsls r0, r2, 31\n\ + lsrs r0, 31\n\ + eors r0, r4\n\ + ands r0, r7\n\ + adds r1, r6, 0\n\ + ands r1, r2\n\ + orrs r1, r0\n\ + strb r1, [r3, 0xE]\n\ +_080DAC32:\n\ + mov r4, r12\n\ + ldrb r1, [r4]\n\ + movs r0, 0x9\n\ + negs r0, r0\n\ + ands r0, r1\n\ + strb r0, [r4]\n\ + ldrh r0, [r4, 0x2]\n\ + mov r8, r0\n\ +_080DAC42:\n\ + mov r1, r12\n\ + ldrb r0, [r1]\n\ + movs r1, 0xF\n\ + ands r1, r0\n\ + movs r0, 0x30\n\ +_080DAC4C:\n\ + orrs r1, r0\n\ + mov r2, r12\n\ + strb r1, [r2]\n\ +_080DAC52:\n\ + mov r3, r12\n\ + ldrb r1, [r3]\n\ + lsls r1, 30\n\ + lsrs r1, 31\n\ + mov r0, r12\n\ + adds r0, 0xC\n\ + adds r0, r1\n\ + ldrb r1, [r0]\n\ + ldr r3, _080DACE0 @ =gSineTable\n\ + mov r4, r8\n\ + lsls r0, r4, 1\n\ + adds r0, r3\n\ + movs r2, 0\n\ + ldrsh r0, [r0, r2]\n\ + muls r0, r1\n\ + asrs r0, 8\n\ + strh r0, [r5, 0x24]\n\ + ldrb r2, [r5, 0x3]\n\ + lsls r2, 26\n\ + lsrs r2, 27\n\ + movs r4, 0x24\n\ + ldrsh r0, [r5, r4]\n\ + negs r0, r0\n\ + asrs r0, 1\n\ + mov r1, r12\n\ + ldrb r1, [r1, 0xA]\n\ + adds r0, r1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + lsls r1, r0, 1\n\ + adds r1, r3\n\ + ldrh r6, [r1]\n\ + ldr r1, _080DACE4 @ =gOamMatrices\n\ + lsls r2, 3\n\ + adds r2, r1\n\ + adds r0, 0x40\n\ + lsls r0, 1\n\ + adds r0, r3\n\ + ldrh r0, [r0]\n\ + strh r0, [r2, 0x6]\n\ + strh r0, [r2]\n\ + strh r6, [r2, 0x2]\n\ + lsls r0, r6, 16\n\ + asrs r0, 16\n\ + negs r0, r0\n\ + strh r0, [r2, 0x4]\n\ + mov r2, r12\n\ + ldrh r0, [r2, 0x6]\n\ + ldrh r3, [r2, 0x8]\n\ + adds r0, r3\n\ + strh r0, [r2, 0x8]\n\ + lsls r0, 16\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x22]\n\ + movs r4, 0x4\n\ + ldrsh r0, [r2, r4]\n\ + movs r1, 0x80\n\ + lsls r1, 8\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080DACE8\n\ + ldrh r0, [r2, 0x4]\n\ + subs r1, 0x1\n\ + ands r1, r0\n\ + ldrh r0, [r2, 0x2]\n\ + subs r0, r1\n\ + movs r1, 0xFF\n\ + ands r0, r1\n\ + strh r0, [r2, 0x2]\n\ + b _080DACFE\n\ + .align 2, 0\n\ +_080DACE0: .4byte gSineTable\n\ +_080DACE4: .4byte gOamMatrices\n\ +_080DACE8:\n\ + mov r1, r12\n\ + ldrh r0, [r1, 0x4]\n\ + ldr r1, _080DAD28 @ =0x00007fff\n\ + ands r1, r0\n\ + mov r2, r12\n\ + ldrh r2, [r2, 0x2]\n\ + adds r1, r2\n\ + movs r0, 0xFF\n\ + ands r1, r0\n\ + mov r3, r12\n\ + strh r1, [r3, 0x2]\n\ +_080DACFE:\n\ + movs r4, 0x22\n\ + ldrsh r1, [r5, r4]\n\ + movs r2, 0x26\n\ + ldrsh r0, [r5, r2]\n\ + adds r1, r0\n\ + mov r3, r12\n\ + ldrh r0, [r3, 0xE]\n\ + lsrs r0, 1\n\ + cmp r1, r0\n\ + blt _080DAD1A\n\ + movs r0, 0\n\ + strh r0, [r5, 0x2E]\n\ + ldr r0, _080DAD2C @ =sub_80DA48C\n\ + str r0, [r5, 0x1C]\n\ +_080DAD1A:\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080DAD28: .4byte 0x00007fff\n\ +_080DAD2C: .4byte sub_80DA48C\n"); +}; +#endif + +void sub_80DAD30(struct Sprite *sprite) +{ + sprite->oam.priority = sub_8079ED4(gAnimBankTarget); + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + sprite->callback = TranslateAnimSpriteToTargetMonLocation; +} + +void sub_80DAD84(struct Sprite * sprite) +{ + s16 matrixNum; + s16 rand; + s16 sinVal; + + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[3] = gBattleAnimArgs[2]; + + if (gMain.inBattle) + { + if (gBanksBySide[gAnimBankTarget] & 1) + { + sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; + } + else + { + // 080dade0 + sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 40; + } + + if (gBattleAnimArgs[4]) + { + sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1; + // 080dae24 + } + else + { + sprite->oam.priority = sub_8079ED4(gAnimBankTarget); + } + } + else + { + sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; + } + + sprite->data[4] = gSineTable[sprite->data[1] & 0xff]; + sprite->data[5] = -gSineTable[(sprite->data[1] & 0xff) + 64]; + sprite->data[6] = 0; + sprite->pos2.x = sprite->pos2.y = 0; + + matrixNum = sprite->oam.matrixNum; + sprite->data[1] = (u8) (sprite->data[1] >> 8); + + rand = Random(); + if (rand & 0x8000) + { + sprite->data[1] = 0xff - sprite->data[1]; + } + + sinVal = gSineTable[sprite->data[1]]; + + gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sprite->data[1] + 64]; + gOamMatrices[matrixNum].b = sinVal; + gOamMatrices[matrixNum].c = -sinVal; + + sprite->animBeginning = 1; + sprite->animEnded = 0; + + if (rand & 1) + { + sprite->animNum = 1; + sprite->hFlip = 1; + } + + sprite->callback = sub_80DAF0C; + +} + +#ifdef NONMATCHING +void sub_80DAF0C(struct Sprite *sprite) +{ + + /* NONMATCHING - Functionally equivalent + * + * differences: + * + * asm contains useless: + * movs r1, 0 + * mov r8, r1 + * where r8 is never used can't be matched + * + * 0x8001 and 0x8002 loaded then added with 0 to r0 instead of loaded straight there */ + + u16 *data; + u16 dataCpy[8]; + int higher; + + data = sprite->data; + + if (++sprite->data[0] > 4) + { + sprite->pos2.x = (sprite->data[4] * sprite->data[6]) >> 8; + sprite->pos2.y = (sprite->data[5] * sprite->data[6]) >> 8; + + sprite->data[6] += sprite->data[3] & 0xff; + + if (sprite->data[6] >= (sprite->data[2] & 0xff)) + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + + sprite->pos2.x = 0; + sprite->pos2.y = 0; + + memcpy(dataCpy, data, 16); + memset(data, 0, 16); + + data[4] = sprite->pos1.y << 8; + data[3] = dataCpy[3] >> 8; + data[1] = 0; + data[5] = dataCpy[1]; + + if (sprite->animNum != 0) + { + if (data[3] & 8) + { + data[2] = 0x8001; + } + else + { + data[2] = 0x8002; + } + } + else + { + if (data[3] & 8) + { + data[2] = 1; + } + else + { + data[2] = 2; + } + } + + ((u8 *) data)[12] = dataCpy[2] >> 8; + ((u8 *) data)[13] = (u8) data[6] - 2; + + higher = dataCpy[7] << 1; + data[7] = (data[7] & 1) | higher; + + sprite->callback = sub_80DA6F0; + } + } +} +#else +NAKED +void sub_80DAF0C(struct Sprite *sprite) +{ + asm_unified("push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + sub sp, 0x10\n\ + adds r4, r0, 0\n\ + adds r5, r4, 0\n\ + adds r5, 0x2E\n\ + ldrh r0, [r4, 0x2E]\n\ + adds r0, 0x1\n\ + movs r1, 0\n\ + mov r8, r1\n\ + movs r7, 0\n\ + strh r0, [r4, 0x2E]\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + cmp r0, 0x4\n\ + ble _080DAFF0\n\ + movs r2, 0x36\n\ + ldrsh r1, [r4, r2]\n\ + movs r2, 0x3A\n\ + ldrsh r0, [r4, r2]\n\ + muls r0, r1\n\ + asrs r6, r0, 8\n\ + strh r6, [r4, 0x24]\n\ + movs r0, 0x38\n\ + ldrsh r1, [r4, r0]\n\ + movs r2, 0x3A\n\ + ldrsh r0, [r4, r2]\n\ + muls r0, r1\n\ + asrs r3, r0, 8\n\ + strh r3, [r4, 0x26]\n\ + ldrh r2, [r4, 0x34]\n\ + movs r1, 0xFF\n\ + adds r0, r1, 0\n\ + ands r0, r2\n\ + ldrh r2, [r4, 0x3A]\n\ + adds r0, r2\n\ + strh r0, [r4, 0x3A]\n\ + ldrh r2, [r4, 0x32]\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + ands r1, r2\n\ + cmp r0, r1\n\ + blt _080DAFF0\n\ + ldrh r0, [r4, 0x20]\n\ + adds r0, r6\n\ + strh r0, [r4, 0x20]\n\ + ldrh r0, [r4, 0x22]\n\ + adds r0, r3\n\ + strh r0, [r4, 0x22]\n\ + strh r7, [r4, 0x24]\n\ + strh r7, [r4, 0x26]\n\ + mov r0, sp\n\ + adds r1, r5, 0\n\ + movs r2, 0x10\n\ + bl memcpy\n\ + adds r0, r5, 0\n\ + movs r1, 0\n\ + movs r2, 0x10\n\ + bl memset\n\ + ldrh r0, [r4, 0x22]\n\ + lsls r0, 8\n\ + strh r0, [r5, 0x8]\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x6]\n\ + lsrs r1, r0, 8\n\ + strh r1, [r5, 0x6]\n\ + strh r7, [r5, 0x2]\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x2]\n\ + strh r0, [r5, 0xA]\n\ + adds r0, r4, 0\n\ + adds r0, 0x2A\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080DAFC0\n\ + movs r0, 0x8\n\ + ands r1, r0\n\ + cmp r1, 0\n\ + beq _080DAFB8\n\ + ldr r0, _080DAFB4 @ =0x00008001\n\ + b _080DAFCE\n\ + .align 2, 0\n\ + _080DAFB4: .4byte 0x00008001\n\ + _080DAFB8:\n\ + ldr r0, _080DAFBC @ =0x00008002\n\ + b _080DAFCE\n\ + .align 2, 0\n\ + _080DAFBC: .4byte 0x00008002\n\ + _080DAFC0:\n\ + movs r0, 0x8\n\ + ands r1, r0\n\ + cmp r1, 0\n\ + beq _080DAFCC\n\ + movs r0, 0x1\n\ + b _080DAFCE\n\ + _080DAFCC:\n\ + movs r0, 0x2\n\ + _080DAFCE:\n\ + strh r0, [r5, 0x4]\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x4]\n\ + lsrs r0, 8\n\ + strb r0, [r5, 0xC]\n\ + subs r0, 0x2\n\ + strb r0, [r5, 0xD]\n\ + mov r0, sp\n\ + ldrh r1, [r0, 0xE]\n\ + lsls r1, 1\n\ + ldrh r2, [r5, 0xE]\n\ + movs r0, 0x1\n\ + ands r0, r2\n\ + orrs r0, r1\n\ + strh r0, [r5, 0xE]\n\ + ldr r0, _080DAFFC @ =sub_80DA6F0\n\ + str r0, [r4, 0x1C]\n\ + _080DAFF0:\n\ + add sp, 0x10\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ + _080DAFFC: .4byte sub_80DA6F0\n"); + +} +#endif + +void sub_80DB000(struct Sprite *sprite) +{ + u16 arg; + u8 mult; + + if (gBattleAnimArgs[2] == 0) + { + InitAnimSpritePos(sprite, 0); + } + else + { + sub_8078764(sprite, 0); + } + + if ((!gBattleAnimArgs[2] && !GetBattlerSide(gAnimBankAttacker)) + || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gAnimBankTarget))) + { + sprite->pos1.x += 8; + } + + SeekSpriteAnim(sprite, gBattleAnimArgs[4]); + sprite->pos1.x -= 32; + sprite->data[1] = 0x0ccc; + + arg = gBattleAnimArgs[4]; + mult = 12; + sprite->pos2.x += mult * arg; + sprite->data[0] = arg; + sprite->data[7] = gBattleAnimArgs[3]; + sprite->callback = sub_80DB0A0; +} + +void sub_80DB0A0(struct Sprite *sprite) +{ + sprite->pos2.x += sprite->data[1] >> 8; + + if (++sprite->data[0] == 6) + { + sprite->data[0] = 0; + sprite->pos2.x = 0; + StartSpriteAnim(sprite, 0); + } + + if (--sprite->data[7] == -1) + { + DestroyAnimSprite(sprite); + } +} + +void sub_80DB0E8(u8 task) +{ + u16 data = gTasks[task].data[0]; + if ((data & 31) == 0) + { + ++gAnimVisualTaskCount; + + gBattleAnimArgs[0] = Sin(gTasks[task].data[0], -13); + gBattleAnimArgs[1] = Cos(gTasks[task].data[0], -13); + gBattleAnimArgs[2] = 1; + gBattleAnimArgs[3] = 3; + + CreateSpriteAndAnimate(&gBattleAnimSpriteTemplate_83DB538, + GetBattlerSpriteCoord(gAnimBankTarget, 2), + GetBattlerSpriteCoord(gAnimBankTarget, 3), + 3); + } + + gTasks[task].data[0] += 8; + + if (gTasks[task].data[0] > 0xff) + { + DestroyAnimVisualTask(task); + } +} + +void sub_80DB194(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + InitAnimSpritePos(sprite, 1); + gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; + ++sprite->data[0]; + break; + case 1: + if (sprite->affineAnimEnded) + { + DestroyAnimSprite(sprite); + } + } +} + +void sub_80DB1F4(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + sprite->pos2.y = -sprite->pos1.y - 32; + ++sprite->data[0]; + break; + case 1: + sprite->pos2.y += 10; + if (sprite->pos2.y >= 0) + { + ++sprite->data[0]; + } + break; + case 2: + sprite->pos2.y -= 10; + if (sprite->pos1.y + sprite->pos2.y < -32) + { + gSprites[GetAnimBattlerSpriteId(0)].invisible = 0; + DestroyAnimSprite(sprite); + } + } +} + +void sub_80DB288(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->callback = sub_80DB2D0; + gSprites[GetAnimBattlerSpriteId(0)].invisible = 1; +} + +void sub_80DB2D0(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + { + --sprite->data[0]; + } + else if (sprite->pos1.y + sprite->pos2.y > -32) + { + sprite->data[2] += sprite->data[1]; + sprite->pos2.y -= (sprite->data[2] >> 8); + } + else + { + sprite->invisible = 1; + if (sprite->data[3]++ > 20) + { + sprite->callback = sub_80DB330; + } + } +} + +void sub_80DB330(struct Sprite *sprite) +{ + sprite->pos2.y += sprite->data[2] >> 8; + + if (sprite->pos1.y + sprite->pos2.y > -32) + { + sprite->invisible = 0; + } + + if (sprite->pos2.y > 0) + { + DestroyAnimSprite(sprite); + } +} + +#ifdef NONMATCHING +void sub_80DB374(struct Sprite *sprite) +{ + // NONMATCHING - Functionally equivalent - slight register swap at end + + u32 matrixNum; + int t1, t3; + s16 t2; + + switch (sprite->data[0]) + { + + case 0: + if (!gBattleAnimArgs[0]) + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1); + } + + sprite->data[1] = 512; + + sub_8078FDC(sprite, 0, 256, sprite->data[1], 0); + ++sprite->data[0]; + break; + case 1: + if (sprite->data[2] <= 11) + { + sprite->data[1] -= 40; + } + else + { + sprite->data[1] += 40; + } + + ++sprite->data[2]; + + sub_8078FDC(sprite, 0, 256, sprite->data[1], 0); + + matrixNum = sprite->oam.matrixNum; + + t1 = 15616; + t2 = gOamMatrices[matrixNum].d; + t3 = t1 / t2 + 1; + + if (t3 > 128) + { + t3 = 128; + } + + /* NONMATCHING + * compiles to: + * asr r0, r0, #0x1 + strh r0, [r5, #0x26] + * needed: + * asrs r1, r0, 1 + * strh r1, [r5, 0x26] */ + sprite->pos2.y = (64 - t3) / 2; + + if (sprite->data[2] == 24) + { + sub_8079098(sprite); + DestroyAnimSprite(sprite); + } + } +} +#else +NAKED +void sub_80DB374(struct Sprite *sprite) +{ + asm_unified("push {r4,r5,lr}\n\ + sub sp, 0x4\n\ + adds r5, r0, 0\n\ + movs r1, 0x2E\n\ + ldrsh r0, [r5, r1]\n\ + cmp r0, 0\n\ + beq _080DB388\n\ + cmp r0, 0x1\n\ + beq _080DB3E0\n\ + b _080DB44C\n\ +_080DB388:\n\ + ldr r0, _080DB398 @ =gBattleAnimArgs\n\ + movs r2, 0\n\ + ldrsh r0, [r0, r2]\n\ + cmp r0, 0\n\ + bne _080DB3A0\n\ + ldr r4, _080DB39C @ =gAnimBankAttacker\n\ + b _080DB3A2\n\ + .align 2, 0\n\ +_080DB398: .4byte gBattleAnimArgs\n\ +_080DB39C: .4byte gAnimBankAttacker\n\ +_080DB3A0:\n\ + ldr r4, _080DB3DC @ =gAnimBankTarget\n\ +_080DB3A2:\n\ + ldrb r0, [r4]\n\ + movs r1, 0\n\ + bl GetBattlerSpriteCoord\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x20]\n\ + ldrb r0, [r4]\n\ + movs r1, 0x1\n\ + bl GetBattlerSpriteCoord\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x22]\n\ + movs r0, 0\n\ + movs r3, 0x80\n\ + lsls r3, 2\n\ + strh r3, [r5, 0x30]\n\ + movs r2, 0x80\n\ + lsls r2, 1\n\ + str r0, [sp]\n\ + adds r0, r5, 0\n\ + movs r1, 0\n\ + bl sub_8078FDC\n\ + ldrh r0, [r5, 0x2E]\n\ + adds r0, 0x1\n\ + strh r0, [r5, 0x2E]\n\ + b _080DB44C\n\ + .align 2, 0\n\ +_080DB3DC: .4byte gAnimBankTarget\n\ +_080DB3E0:\n\ + movs r1, 0x32\n\ + ldrsh r0, [r5, r1]\n\ + cmp r0, 0xB\n\ + bgt _080DB3EE\n\ + ldrh r0, [r5, 0x30]\n\ + subs r0, 0x28\n\ + b _080DB3F2\n\ +_080DB3EE:\n\ + ldrh r0, [r5, 0x30]\n\ + adds r0, 0x28\n\ +_080DB3F2:\n\ + strh r0, [r5, 0x30]\n\ + ldrh r0, [r5, 0x32]\n\ + adds r0, 0x1\n\ + movs r1, 0\n\ + strh r0, [r5, 0x32]\n\ + movs r2, 0x80\n\ + lsls r2, 1\n\ + movs r0, 0x30\n\ + ldrsh r3, [r5, r0]\n\ + str r1, [sp]\n\ + adds r0, r5, 0\n\ + bl sub_8078FDC\n\ + ldrb r1, [r5, 0x3]\n\ + lsls r1, 26\n\ + lsrs r1, 27\n\ + movs r0, 0xF4\n\ + lsls r0, 6\n\ + ldr r2, _080DB454 @ =gOamMatrices\n\ + lsls r1, 3\n\ + adds r1, r2\n\ + movs r2, 0x6\n\ + ldrsh r1, [r1, r2]\n\ + bl __divsi3\n\ + adds r1, r0, 0x1\n\ + cmp r1, 0x80\n\ + ble _080DB42C\n\ + movs r1, 0x80\n\ +_080DB42C:\n\ + movs r0, 0x40\n\ + subs r0, r1\n\ + lsrs r1, r0, 31\n\ + adds r0, r1\n\ + asrs r1, r0, 1\n\ + strh r1, [r5, 0x26]\n\ + movs r1, 0x32\n\ + ldrsh r0, [r5, r1]\n\ + cmp r0, 0x18\n\ + bne _080DB44C\n\ + adds r0, r5, 0\n\ + bl sub_8079098\n\ + adds r0, r5, 0\n\ + bl DestroyAnimSprite\n\ +_080DB44C:\n\ + add sp, 0x4\n\ + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080DB454: .4byte gOamMatrices\n"); +} +#endif + +void sub_80DB458(struct Sprite *sprite) +{ + int v1, v2; + + v1 = 0x1ff & Random(); + v2 = 0x7f & Random(); + + if (v1 & 1) + { + sprite->data[0] = 736 + v1; + } + else + { + sprite->data[0] = 736 - v1; + } + + if (v2 & 1) + { + sprite->data[1] = 896 + v2; + } + else + { + sprite->data[1] = 896 - v2; + } + + sprite->data[2] = gBattleAnimArgs[0]; + + if (sprite->data[2]) + { + sprite->oam.matrixNum = 8; + } + + if (gBattleAnimArgs[1] == 0) + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 32; + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 32; + } + + sprite->callback = sub_80DB508; +} + +void sub_80DB508(struct Sprite *sprite) +{ + if (sprite->data[2] == 0) + { + sprite->pos2.x += sprite->data[0] >> 8; + sprite->pos2.y -= sprite->data[1] >> 8; + } + else + { + sprite->pos2.x -= sprite->data[0] >> 8; + sprite->pos2.y -= sprite->data[1] >> 8; + } + + sprite->data[0] = sprite->data[0]; + sprite->data[1] -= 32; + + if (sprite->data[0] < 0) + { + sprite->data[0] = 0; + } + + if (++sprite->data[3] == 31) + { + DestroyAnimSprite(sprite); + } +} + +void sub_80DB564(struct Sprite *sprite) +{ + sprite->data[6] = 0; + sprite->data[7] = 0x40; + sprite->callback = sub_80DB578; +} + +void sub_80DB578(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (++sprite->data[1] > 8) + { + sprite->data[1] = 0; + sprite->invisible ^= 1; + if (++sprite->data[2] > 5 && sprite->invisible) + { + sprite->data[0]++; + } + } + break; + case 1: + DestroyAnimSprite(sprite); + } +} + +void sub_80DB5E4(struct Sprite *sprite) +{ + s16 posx, posy; + u16 rotation; + + posx = sprite->pos1.x; + posy = sprite->pos1.y; + + sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); + + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + + sprite->data[6] = ((posx - sprite->pos1.x) << 4) / 12; + sprite->data[7] = ((posy - sprite->pos1.y) << 4) / 12; + + rotation = ArcTan2Neg(posx - sprite->pos1.x, posy - sprite->pos1.y); + rotation += 0xc000; + + sub_8078FDC(sprite, 1, 0x100, 0x100, rotation); + + sprite->callback = sub_80DB6A0; +} + +void sub_80DB6A0(struct Sprite *sprite) +{ + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + + if ((u16) (sprite->pos1.x + 0x2d) > 0x14a || sprite->pos1.y > 0x9d || sprite->pos1.y < -0x2d) + { + move_anim_8074EE0(sprite); + } +} + +void unref_sub_80DB6E4(u8 taskId) +{ + if (gBattleAnimArgs[0] == 0) + { + u8 spriteId = GetAnimBattlerSpriteId(0); + gSprites[spriteId].invisible = 1; + } + else + { + u8 spriteId = GetAnimBattlerSpriteId(0); + gSprites[spriteId].invisible = 0; + } + + DestroyAnimVisualTask(taskId); +}
\ No newline at end of file diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 54cacd0cb..39ba0318b 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -13996,153 +13996,30 @@ static void atkC0_recoverbasedonsunlight(void) } } -NAKED static void atkC1_hiddenpowercalc(void) { - asm(".syntax unified\n\ -push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - ldr r2, _08029894 @ =gBattleMons\n\ - ldr r0, _08029898 @ =gBankAttacker\n\ - ldrb r1, [r0]\n\ - movs r0, 0x58\n\ - adds r4, r1, 0\n\ - muls r4, r0\n\ - adds r4, r2\n\ - ldrb r0, [r4, 0x14]\n\ - mov r10, r0\n\ - mov r7, r10\n\ - lsls r7, 27\n\ - adds r0, r7, 0\n\ - lsrs r0, 27\n\ - mov r10, r0\n\ - movs r1, 0x2\n\ - mov r2, r10\n\ - ands r2, r1\n\ - asrs r2, 1\n\ - ldrh r7, [r4, 0x14]\n\ - mov r9, r7\n\ - mov r0, r9\n\ - lsls r0, 22\n\ - mov r9, r0\n\ - lsrs r3, r0, 27\n\ - adds r0, r1, 0\n\ - ands r0, r3\n\ - orrs r2, r0\n\ - ldrb r7, [r4, 0x15]\n\ - mov r8, r7\n\ - mov r0, r8\n\ - lsls r0, 25\n\ - mov r8, r0\n\ - lsrs r3, r0, 27\n\ - adds r0, r1, 0\n\ - ands r0, r3\n\ - lsls r0, 1\n\ - orrs r2, r0\n\ - ldr r6, [r4, 0x14]\n\ - lsls r6, 12\n\ - lsrs r3, r6, 27\n\ - adds r0, r1, 0\n\ - ands r0, r3\n\ - lsls r0, 2\n\ - orrs r2, r0\n\ - ldrh r5, [r4, 0x16]\n\ - lsls r5, 23\n\ - lsrs r3, r5, 27\n\ - adds r0, r1, 0\n\ - ands r0, r3\n\ - lsls r0, 3\n\ - orrs r2, r0\n\ - ldrb r3, [r4, 0x17]\n\ - lsls r3, 26\n\ - lsrs r0, r3, 27\n\ - ands r1, r0\n\ - lsls r1, 4\n\ - orrs r2, r1\n\ - movs r1, 0x1\n\ - adds r4, r1, 0\n\ - mov r7, r10\n\ - ands r4, r7\n\ - mov r0, r9\n\ - lsrs r0, 27\n\ - mov r9, r0\n\ - adds r0, r1, 0\n\ - mov r7, r9\n\ - ands r0, r7\n\ - lsls r0, 1\n\ - orrs r4, r0\n\ - mov r0, r8\n\ - lsrs r0, 27\n\ - mov r8, r0\n\ - adds r0, r1, 0\n\ - mov r7, r8\n\ - ands r0, r7\n\ - lsls r0, 2\n\ - orrs r4, r0\n\ - lsrs r6, 27\n\ - adds r0, r1, 0\n\ - ands r0, r6\n\ - lsls r0, 3\n\ - orrs r4, r0\n\ - lsrs r5, 27\n\ - adds r0, r1, 0\n\ - ands r0, r5\n\ - lsls r0, 4\n\ - orrs r4, r0\n\ - lsrs r3, 27\n\ - ands r1, r3\n\ - lsls r1, 5\n\ - orrs r4, r1\n\ - ldr r5, _0802989C @ =gDynamicBasePower\n\ - lsls r0, r2, 2\n\ - adds r0, r2\n\ - lsls r0, 3\n\ - movs r1, 0x3F\n\ - bl __divsi3\n\ - adds r0, 0x1E\n\ - strh r0, [r5]\n\ - ldr r5, _080298A0 @ =gSharedMem\n\ - lsls r0, r4, 4\n\ - subs r0, r4\n\ - movs r1, 0x3F\n\ - bl __divsi3\n\ - adds r1, r0, 0x1\n\ - ldr r0, _080298A4 @ =0x0001601c\n\ - adds r5, r0\n\ - strb r1, [r5]\n\ - lsls r0, r1, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x8\n\ - bls _08029876\n\ - adds r0, r1, 0x1\n\ - strb r0, [r5]\n\ -_08029876:\n\ - ldrb r0, [r5]\n\ - movs r1, 0xC0\n\ - orrs r0, r1\n\ - strb r0, [r5]\n\ - ldr r1, _080298A8 @ =gBattlescriptCurrInstr\n\ - ldr r0, [r1]\n\ - adds r0, 0x1\n\ - str r0, [r1]\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_08029894: .4byte gBattleMons\n\ -_08029898: .4byte gBankAttacker\n\ -_0802989C: .4byte gDynamicBasePower\n\ -_080298A0: .4byte gSharedMem\n\ -_080298A4: .4byte 0x0001601c\n\ -_080298A8: .4byte gBattlescriptCurrInstr\n\ - .syntax divided"); + u8 power = ((gBattleMons[gBankAttacker].hpIV & 2) >> 1) | + ((gBattleMons[gBankAttacker].attackIV & 2)) | + ((gBattleMons[gBankAttacker].defenseIV & 2) << 1) | + ((gBattleMons[gBankAttacker].speedIV & 2) << 2) | + ((gBattleMons[gBankAttacker].spAttackIV & 2) << 3) | + ((gBattleMons[gBankAttacker].spDefenseIV & 2) << 4); + u8 type = ((gBattleMons[gBankAttacker].hpIV & 1)) | + ((gBattleMons[gBankAttacker].attackIV & 1) << 1) | + ((gBattleMons[gBankAttacker].defenseIV & 1) << 2) | + ((gBattleMons[gBankAttacker].speedIV & 1) << 3) | + ((gBattleMons[gBankAttacker].spAttackIV & 1) << 4) | + ((gBattleMons[gBankAttacker].spDefenseIV & 1) << 5); + + gDynamicBasePower = 30 + (power * 40 / 63); + + gBattleStruct->dynamicMoveType = ((type * 15) / 63) + 1; + if (gBattleStruct->dynamicMoveType >= TYPE_MYSTERY) + gBattleStruct->dynamicMoveType++; + + gBattleStruct->dynamicMoveType |= 0xC0; + + gBattlescriptCurrInstr++; } static void atkC2_selectfirstvalidtarget(void) diff --git a/src/birch_pc.c b/src/birch_pc.c index 4b0025504..2a76b3c8c 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -87,24 +87,24 @@ const u8 *GetPokedexRatingText(u16 count) return gBirchDexRatingText_LessThan180; if (count < 190) return gBirchDexRatingText_LessThan190; - if (count < 200) + if (count < HOENN_DEX_COUNT - 2) return gBirchDexRatingText_LessThan200; - if (count == 200) + if (count == HOENN_DEX_COUNT - 2) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1) || GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // Jirachi or Deoxys is not counted towards the dex completion. If either of these flags are enabled, it means the actual count is less than 200. return gBirchDexRatingText_LessThan200; return gBirchDexRatingText_DexCompleted; } - if (count == 201) + if (count == HOENN_DEX_COUNT - 1) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1) && GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // If both of these flags are enabled, it means the actual count is less than 200. return gBirchDexRatingText_LessThan200; return gBirchDexRatingText_DexCompleted; } - if (count == 202) - return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, even though the hoenn dex count is 210. + if (count == HOENN_DEX_COUNT) + return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, a count of 202 means Jirachi and Deoxys are obtained return gBirchDexRatingText_LessThan10; } diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h index 185efc68e..69f33c393 100644 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ b/src/data/field_event_obj/berry_tree_graphics_tables.h @@ -6,421 +6,421 @@ #define POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_0), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_1), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_2), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_3), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_4), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_0), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_1), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_2), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_3), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_4), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_0), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_1), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_2), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_3), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_4), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_0), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_1), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_2), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_3), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_4), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_0), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_1), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_2), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_3), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_4), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_0), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_1), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_2), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_3), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_4), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_0), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_1), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_2), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_3), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_4), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LumBerryTree_0), - obj_frame_tiles(gEventObjectPic_LumBerryTree_1), - obj_frame_tiles(gEventObjectPic_LumBerryTree_2), - obj_frame_tiles(gEventObjectPic_LumBerryTree_3), - obj_frame_tiles(gEventObjectPic_LumBerryTree_4), - obj_frame_tiles(gEventObjectPic_LumBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_0), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_1), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_2), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_3), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_4), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_0), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_1), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_2), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_3), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_4), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_0), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_1), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_2), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_3), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_4), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_0), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_1), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_2), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_3), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_4), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_0), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_1), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_2), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_3), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_4), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_0), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_1), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_2), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_3), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_4), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_0), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_1), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_2), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_3), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_4), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_0), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_1), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_2), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_3), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_4), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_0), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_1), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_2), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_3), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_4), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_0), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_1), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_2), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_3), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_4), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_0), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_1), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_2), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_3), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_4), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_0), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_1), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_2), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_3), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_4), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_0), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_1), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_2), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_3), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_4), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_OranBerryTree_0), - obj_frame_tiles(gEventObjectPic_OranBerryTree_1), - obj_frame_tiles(gEventObjectPic_OranBerryTree_2), - obj_frame_tiles(gEventObjectPic_OranBerryTree_3), - obj_frame_tiles(gEventObjectPic_OranBerryTree_4), - obj_frame_tiles(gEventObjectPic_OranBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_0), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_1), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_2), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_3), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_4), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_0), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_1), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_2), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_3), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_4), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_0), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_1), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_2), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_3), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_4), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_0), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_1), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_2), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_3), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_4), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_0), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_1), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_2), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_3), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_4), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_0), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_1), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_2), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_3), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_4), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_0), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_1), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_2), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_3), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_4), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_0), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_1), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_2), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_3), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_4), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_5) + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5) }; const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 8f1bb96a8..0be0be30a 100644 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -1,24 +1,7 @@ #ifndef POKERUBY_EVENT_OBJECT_GFX_H #define POKERUBY_EVENT_OBJECT_GFX_H -const u32 gEventObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/00.4bpp"); -const u32 gEventObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/01.4bpp"); -const u32 gEventObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/02.4bpp"); -const u32 gEventObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/03.4bpp"); -const u32 gEventObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/04.4bpp"); -const u32 gEventObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/05.4bpp"); -const u32 gEventObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/06.4bpp"); -const u32 gEventObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/07.4bpp"); -const u32 gEventObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/08.4bpp"); -const u32 gEventObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/09.4bpp"); -const u32 gEventObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/10.4bpp"); -const u32 gEventObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/11.4bpp"); -const u32 gEventObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/12.4bpp"); -const u32 gEventObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/13.4bpp"); -const u32 gEventObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/14.4bpp"); -const u32 gEventObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/15.4bpp"); -const u32 gEventObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/16.4bpp"); -const u32 gEventObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/17.4bpp"); +const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal.4bpp"); const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/08.gbapal"); const u16 NullPalette_8310F68[16] = {}; const u16 NullPalette_8310F88[16] = {}; @@ -37,100 +20,18 @@ const u16 NullPalette_8311108[16] = {}; const u16 NullPalette_8311128[16] = {}; const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/09.gbapal"); const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/10.gbapal"); -const u32 gEventObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/0.4bpp"); -const u32 gEventObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/1.4bpp"); -const u32 gEventObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/2.4bpp"); -const u32 gEventObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/3.4bpp"); -const u32 gEventObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/4.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/0.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/3.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/1.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/4.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/2.4bpp"); -const u32 gEventObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/5.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/0.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/1.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/2.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/3.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/4.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/5.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/6.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/7.4bpp"); -const u32 gEventObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/8.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/00.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/01.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/02.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/03.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/04.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/05.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/06.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/07.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/08.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/09.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/10.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/11.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/12.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/13.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/14.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/15.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/16.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/17.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/18.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/19.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/20.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/21.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/22.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/23.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/24.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/25.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/26.4bpp"); -const u32 gEventObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/00.4bpp"); -const u32 gEventObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/01.4bpp"); -const u32 gEventObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/02.4bpp"); -const u32 gEventObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/03.4bpp"); -const u32 gEventObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/04.4bpp"); -const u32 gEventObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/05.4bpp"); -const u32 gEventObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/06.4bpp"); -const u32 gEventObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/07.4bpp"); -const u32 gEventObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/08.4bpp"); -const u32 gEventObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/09.4bpp"); -const u32 gEventObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/10.4bpp"); -const u32 gEventObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/11.4bpp"); -const u32 gEventObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/0.4bpp"); -const u32 gEventObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/3.4bpp"); -const u32 gEventObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/1.4bpp"); -const u32 gEventObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/4.4bpp"); -const u32 gEventObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/2.4bpp"); -const u32 gEventObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/5.4bpp"); +const u32 gEventObjectPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); +const u32 gEventObjectPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); +const u32 gEventObjectPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); +const u32 gEventObjectPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); +const u32 gEventObjectPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); +const u32 gEventObjectPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/0.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/1.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/2.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/3.4bpp"); -const u32 gEventObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/0.4bpp"); -const u32 gEventObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/1.4bpp"); -const u32 gEventObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/2.4bpp"); -const u32 gEventObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/3.4bpp"); +const u32 gEventObjectPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); +const u32 gEventObjectPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/11.gbapal"); -const u32 gEventObjectPic_MayNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/00.4bpp"); -const u32 gEventObjectPic_MayNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/01.4bpp"); -const u32 gEventObjectPic_MayNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/02.4bpp"); -const u32 gEventObjectPic_MayNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/03.4bpp"); -const u32 gEventObjectPic_MayNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/04.4bpp"); -const u32 gEventObjectPic_MayNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/05.4bpp"); -const u32 gEventObjectPic_MayNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/06.4bpp"); -const u32 gEventObjectPic_MayNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/07.4bpp"); -const u32 gEventObjectPic_MayNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/08.4bpp"); -const u32 gEventObjectPic_MayNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/09.4bpp"); -const u32 gEventObjectPic_MayNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/10.4bpp"); -const u32 gEventObjectPic_MayNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/11.4bpp"); -const u32 gEventObjectPic_MayNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/12.4bpp"); -const u32 gEventObjectPic_MayNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/13.4bpp"); -const u32 gEventObjectPic_MayNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/14.4bpp"); -const u32 gEventObjectPic_MayNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/15.4bpp"); -const u32 gEventObjectPic_MayNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/16.4bpp"); -const u32 gEventObjectPic_MayNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/17.4bpp"); +const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal.4bpp"); const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/17.gbapal"); const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/18.gbapal"); const u16 NullPalette_831B7E8[16] = {}; @@ -147,71 +48,12 @@ const u16 NullPalette_831B928[16] = {}; const u16 NullPalette_831B948[16] = {}; const u16 NullPalette_831B968[16] = {}; const u16 NullPalette_831B988[16] = {}; -const u32 gEventObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/0.4bpp"); -const u32 gEventObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/1.4bpp"); -const u32 gEventObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/2.4bpp"); -const u32 gEventObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/3.4bpp"); -const u32 gEventObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/4.4bpp"); -const u32 gEventObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/5.4bpp"); -const u32 gEventObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/6.4bpp"); -const u32 gEventObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/7.4bpp"); -const u32 gEventObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/8.4bpp"); -const u32 gEventObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/00.4bpp"); -const u32 gEventObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/01.4bpp"); -const u32 gEventObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/02.4bpp"); -const u32 gEventObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/03.4bpp"); -const u32 gEventObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/04.4bpp"); -const u32 gEventObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/05.4bpp"); -const u32 gEventObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/06.4bpp"); -const u32 gEventObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/07.4bpp"); -const u32 gEventObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/08.4bpp"); -const u32 gEventObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/09.4bpp"); -const u32 gEventObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/10.4bpp"); -const u32 gEventObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/11.4bpp"); -const u32 gEventObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/12.4bpp"); -const u32 gEventObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/13.4bpp"); -const u32 gEventObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/14.4bpp"); -const u32 gEventObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/15.4bpp"); -const u32 gEventObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/16.4bpp"); -const u32 gEventObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/17.4bpp"); -const u32 gEventObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/18.4bpp"); -const u32 gEventObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/19.4bpp"); -const u32 gEventObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/20.4bpp"); -const u32 gEventObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/21.4bpp"); -const u32 gEventObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/22.4bpp"); -const u32 gEventObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/23.4bpp"); -const u32 gEventObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/24.4bpp"); -const u32 gEventObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/25.4bpp"); -const u32 gEventObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/26.4bpp"); -const u32 gEventObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/0.4bpp"); -const u32 gEventObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/3.4bpp"); -const u32 gEventObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/1.4bpp"); -const u32 gEventObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/4.4bpp"); -const u32 gEventObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/2.4bpp"); -const u32 gEventObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/5.4bpp"); -const u32 gEventObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/0.4bpp"); -const u32 gEventObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/1.4bpp"); -const u32 gEventObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/2.4bpp"); -const u32 gEventObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/3.4bpp"); -const u32 gEventObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/4.4bpp"); -const u32 gEventObjectPic_MayFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/00.4bpp"); -const u32 gEventObjectPic_MayFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/01.4bpp"); -const u32 gEventObjectPic_MayFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/02.4bpp"); -const u32 gEventObjectPic_MayFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/03.4bpp"); -const u32 gEventObjectPic_MayFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/04.4bpp"); -const u32 gEventObjectPic_MayFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/05.4bpp"); -const u32 gEventObjectPic_MayFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/06.4bpp"); -const u32 gEventObjectPic_MayFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/07.4bpp"); -const u32 gEventObjectPic_MayFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/08.4bpp"); -const u32 gEventObjectPic_MayFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/09.4bpp"); -const u32 gEventObjectPic_MayFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/10.4bpp"); -const u32 gEventObjectPic_MayFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/11.4bpp"); -const u32 gEventObjectPic_MayWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/0.4bpp"); -const u32 gEventObjectPic_MayWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/3.4bpp"); -const u32 gEventObjectPic_MayWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/1.4bpp"); -const u32 gEventObjectPic_MayWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/4.4bpp"); -const u32 gEventObjectPic_MayWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/2.4bpp"); -const u32 gEventObjectPic_MayWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/5.4bpp"); +const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); +const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); +const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); +const u32 gEventObjectPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); +const u32 gEventObjectPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); +const u32 gEventObjectPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/00.gbapal"); const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/01.gbapal"); const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/02.gbapal"); @@ -220,807 +62,114 @@ const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/0 const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/05.gbapal"); const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/06.gbapal"); const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/07.gbapal"); -const u32 gEventObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/0.4bpp"); -const u32 gEventObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/1.4bpp"); -const u32 gEventObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/2.4bpp"); -const u32 gEventObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/3.4bpp"); -const u32 gEventObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/4.4bpp"); -const u32 gEventObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/5.4bpp"); -const u32 gEventObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/6.4bpp"); -const u32 gEventObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/7.4bpp"); -const u32 gEventObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/8.4bpp"); -const u32 gEventObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/0.4bpp"); -const u32 gEventObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/1.4bpp"); -const u32 gEventObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/2.4bpp"); -const u32 gEventObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/3.4bpp"); -const u32 gEventObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/4.4bpp"); -const u32 gEventObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/5.4bpp"); -const u32 gEventObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/6.4bpp"); -const u32 gEventObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/7.4bpp"); -const u32 gEventObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/8.4bpp"); -const u32 gEventObjectPic_Boy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/0.4bpp"); -const u32 gEventObjectPic_Boy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/1.4bpp"); -const u32 gEventObjectPic_Boy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/2.4bpp"); -const u32 gEventObjectPic_Boy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/3.4bpp"); -const u32 gEventObjectPic_Boy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/4.4bpp"); -const u32 gEventObjectPic_Boy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/5.4bpp"); -const u32 gEventObjectPic_Boy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/6.4bpp"); -const u32 gEventObjectPic_Boy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/7.4bpp"); -const u32 gEventObjectPic_Boy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/8.4bpp"); -const u32 gEventObjectPic_Girl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/0.4bpp"); -const u32 gEventObjectPic_Girl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/1.4bpp"); -const u32 gEventObjectPic_Girl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/2.4bpp"); -const u32 gEventObjectPic_Girl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/3.4bpp"); -const u32 gEventObjectPic_Girl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/4.4bpp"); -const u32 gEventObjectPic_Girl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/5.4bpp"); -const u32 gEventObjectPic_Girl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/6.4bpp"); -const u32 gEventObjectPic_Girl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/7.4bpp"); -const u32 gEventObjectPic_Girl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/8.4bpp"); -const u32 gEventObjectPic_Boy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/0.4bpp"); -const u32 gEventObjectPic_Boy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/1.4bpp"); -const u32 gEventObjectPic_Boy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/2.4bpp"); -const u32 gEventObjectPic_Boy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/3.4bpp"); -const u32 gEventObjectPic_Boy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/4.4bpp"); -const u32 gEventObjectPic_Boy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/5.4bpp"); -const u32 gEventObjectPic_Boy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/6.4bpp"); -const u32 gEventObjectPic_Boy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/7.4bpp"); -const u32 gEventObjectPic_Boy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/8.4bpp"); -const u32 gEventObjectPic_Girl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/0.4bpp"); -const u32 gEventObjectPic_Girl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/1.4bpp"); -const u32 gEventObjectPic_Girl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/2.4bpp"); -const u32 gEventObjectPic_Girl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/3.4bpp"); -const u32 gEventObjectPic_Girl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/4.4bpp"); -const u32 gEventObjectPic_Girl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/5.4bpp"); -const u32 gEventObjectPic_Girl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/6.4bpp"); -const u32 gEventObjectPic_Girl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/7.4bpp"); -const u32 gEventObjectPic_Girl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/8.4bpp"); -const u32 gEventObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/0.4bpp"); -const u32 gEventObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/1.4bpp"); -const u32 gEventObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/2.4bpp"); -const u32 gEventObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/3.4bpp"); -const u32 gEventObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/4.4bpp"); -const u32 gEventObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/5.4bpp"); -const u32 gEventObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/6.4bpp"); -const u32 gEventObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/7.4bpp"); -const u32 gEventObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/8.4bpp"); -const u32 gEventObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/0.4bpp"); -const u32 gEventObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/1.4bpp"); -const u32 gEventObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/2.4bpp"); -const u32 gEventObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/3.4bpp"); -const u32 gEventObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/4.4bpp"); -const u32 gEventObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/5.4bpp"); -const u32 gEventObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/6.4bpp"); -const u32 gEventObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/7.4bpp"); -const u32 gEventObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/8.4bpp"); -const u32 gEventObjectPic_Boy3_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/0.4bpp"); -const u32 gEventObjectPic_Boy3_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/1.4bpp"); -const u32 gEventObjectPic_Boy3_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/2.4bpp"); -const u32 gEventObjectPic_Boy3_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/3.4bpp"); -const u32 gEventObjectPic_Boy3_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/4.4bpp"); -const u32 gEventObjectPic_Boy3_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/5.4bpp"); -const u32 gEventObjectPic_Boy3_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/6.4bpp"); -const u32 gEventObjectPic_Boy3_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/7.4bpp"); -const u32 gEventObjectPic_Boy3_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/8.4bpp"); -const u32 gEventObjectPic_Girl3_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/0.4bpp"); -const u32 gEventObjectPic_Girl3_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/1.4bpp"); -const u32 gEventObjectPic_Girl3_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/2.4bpp"); -const u32 gEventObjectPic_Girl3_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/3.4bpp"); -const u32 gEventObjectPic_Girl3_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/4.4bpp"); -const u32 gEventObjectPic_Girl3_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/5.4bpp"); -const u32 gEventObjectPic_Girl3_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/6.4bpp"); -const u32 gEventObjectPic_Girl3_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/7.4bpp"); -const u32 gEventObjectPic_Girl3_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/8.4bpp"); -const u32 gEventObjectPic_Boy4_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/0.4bpp"); -const u32 gEventObjectPic_Boy4_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/1.4bpp"); -const u32 gEventObjectPic_Boy4_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/2.4bpp"); -const u32 gEventObjectPic_Boy4_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/3.4bpp"); -const u32 gEventObjectPic_Boy4_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/4.4bpp"); -const u32 gEventObjectPic_Boy4_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/5.4bpp"); -const u32 gEventObjectPic_Boy4_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/6.4bpp"); -const u32 gEventObjectPic_Boy4_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/7.4bpp"); -const u32 gEventObjectPic_Boy4_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/8.4bpp"); -const u32 gEventObjectPic_Woman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/0.4bpp"); -const u32 gEventObjectPic_Woman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/1.4bpp"); -const u32 gEventObjectPic_Woman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/2.4bpp"); -const u32 gEventObjectPic_Woman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/3.4bpp"); -const u32 gEventObjectPic_Woman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/4.4bpp"); -const u32 gEventObjectPic_Woman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/5.4bpp"); -const u32 gEventObjectPic_Woman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/6.4bpp"); -const u32 gEventObjectPic_Woman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/7.4bpp"); -const u32 gEventObjectPic_Woman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/8.4bpp"); -const u32 gEventObjectPic_FatMan_0[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/0.4bpp"); -const u32 gEventObjectPic_FatMan_1[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/1.4bpp"); -const u32 gEventObjectPic_FatMan_2[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/2.4bpp"); -const u32 gEventObjectPic_FatMan_3[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/3.4bpp"); -const u32 gEventObjectPic_FatMan_4[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/4.4bpp"); -const u32 gEventObjectPic_FatMan_5[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/5.4bpp"); -const u32 gEventObjectPic_FatMan_6[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/6.4bpp"); -const u32 gEventObjectPic_FatMan_7[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/7.4bpp"); -const u32 gEventObjectPic_FatMan_8[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/8.4bpp"); -const u32 gEventObjectPic_Woman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/0.4bpp"); -const u32 gEventObjectPic_Woman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/1.4bpp"); -const u32 gEventObjectPic_Woman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/2.4bpp"); -const u32 gEventObjectPic_Woman2_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/3.4bpp"); -const u32 gEventObjectPic_Woman2_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/4.4bpp"); -const u32 gEventObjectPic_Woman2_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/5.4bpp"); -const u32 gEventObjectPic_Woman2_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/6.4bpp"); -const u32 gEventObjectPic_Woman2_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/7.4bpp"); -const u32 gEventObjectPic_Woman2_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/8.4bpp"); -const u32 gEventObjectPic_Man1_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/0.4bpp"); -const u32 gEventObjectPic_Man1_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/1.4bpp"); -const u32 gEventObjectPic_Man1_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/2.4bpp"); -const u32 gEventObjectPic_Man1_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/3.4bpp"); -const u32 gEventObjectPic_Man1_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/4.4bpp"); -const u32 gEventObjectPic_Man1_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/5.4bpp"); -const u32 gEventObjectPic_Man1_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/6.4bpp"); -const u32 gEventObjectPic_Man1_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/7.4bpp"); -const u32 gEventObjectPic_Man1_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/8.4bpp"); -const u32 gEventObjectPic_Woman3_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/0.4bpp"); -const u32 gEventObjectPic_Woman3_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/1.4bpp"); -const u32 gEventObjectPic_Woman3_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/2.4bpp"); -const u32 gEventObjectPic_Woman3_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/3.4bpp"); -const u32 gEventObjectPic_Woman3_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/4.4bpp"); -const u32 gEventObjectPic_Woman3_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/5.4bpp"); -const u32 gEventObjectPic_Woman3_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/6.4bpp"); -const u32 gEventObjectPic_Woman3_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/7.4bpp"); -const u32 gEventObjectPic_Woman3_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/8.4bpp"); -const u32 gEventObjectPic_OldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/0.4bpp"); -const u32 gEventObjectPic_OldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/1.4bpp"); -const u32 gEventObjectPic_OldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/2.4bpp"); -const u32 gEventObjectPic_OldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/3.4bpp"); -const u32 gEventObjectPic_OldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/4.4bpp"); -const u32 gEventObjectPic_OldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/5.4bpp"); -const u32 gEventObjectPic_OldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/6.4bpp"); -const u32 gEventObjectPic_OldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/7.4bpp"); -const u32 gEventObjectPic_OldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/8.4bpp"); -const u32 gEventObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/0.4bpp"); -const u32 gEventObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/1.4bpp"); -const u32 gEventObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/2.4bpp"); -const u32 gEventObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/3.4bpp"); -const u32 gEventObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/4.4bpp"); -const u32 gEventObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/5.4bpp"); -const u32 gEventObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/6.4bpp"); -const u32 gEventObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/7.4bpp"); -const u32 gEventObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/8.4bpp"); -const u32 gEventObjectPic_Man2_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/0.4bpp"); -const u32 gEventObjectPic_Man2_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/1.4bpp"); -const u32 gEventObjectPic_Man2_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/2.4bpp"); -const u32 gEventObjectPic_Man2_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/3.4bpp"); -const u32 gEventObjectPic_Man2_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/4.4bpp"); -const u32 gEventObjectPic_Man2_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/5.4bpp"); -const u32 gEventObjectPic_Man2_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/6.4bpp"); -const u32 gEventObjectPic_Man2_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/7.4bpp"); -const u32 gEventObjectPic_Man2_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/8.4bpp"); -const u32 gEventObjectPic_Woman4_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/0.4bpp"); -const u32 gEventObjectPic_Woman4_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/1.4bpp"); -const u32 gEventObjectPic_Woman4_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/2.4bpp"); -const u32 gEventObjectPic_Woman4_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/3.4bpp"); -const u32 gEventObjectPic_Woman4_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/4.4bpp"); -const u32 gEventObjectPic_Woman4_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/5.4bpp"); -const u32 gEventObjectPic_Woman4_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/6.4bpp"); -const u32 gEventObjectPic_Woman4_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/7.4bpp"); -const u32 gEventObjectPic_Woman4_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/8.4bpp"); -const u32 gEventObjectPic_Man3_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/0.4bpp"); -const u32 gEventObjectPic_Man3_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/1.4bpp"); -const u32 gEventObjectPic_Man3_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/2.4bpp"); -const u32 gEventObjectPic_Man3_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/3.4bpp"); -const u32 gEventObjectPic_Man3_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/4.4bpp"); -const u32 gEventObjectPic_Man3_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/5.4bpp"); -const u32 gEventObjectPic_Man3_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/6.4bpp"); -const u32 gEventObjectPic_Man3_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/7.4bpp"); -const u32 gEventObjectPic_Man3_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/8.4bpp"); -const u32 gEventObjectPic_Woman5_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/0.4bpp"); -const u32 gEventObjectPic_Woman5_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/1.4bpp"); -const u32 gEventObjectPic_Woman5_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/2.4bpp"); -const u32 gEventObjectPic_Woman5_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/3.4bpp"); -const u32 gEventObjectPic_Woman5_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/4.4bpp"); -const u32 gEventObjectPic_Woman5_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/5.4bpp"); -const u32 gEventObjectPic_Woman5_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/6.4bpp"); -const u32 gEventObjectPic_Woman5_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/7.4bpp"); -const u32 gEventObjectPic_Woman5_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/8.4bpp"); -const u32 gEventObjectPic_Cook_0[] = INCBIN_U32("graphics/event_objects/pics/people/cook/0.4bpp"); -const u32 gEventObjectPic_Cook_1[] = INCBIN_U32("graphics/event_objects/pics/people/cook/1.4bpp"); -const u32 gEventObjectPic_Cook_2[] = INCBIN_U32("graphics/event_objects/pics/people/cook/2.4bpp"); -const u32 gEventObjectPic_Woman6_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/0.4bpp"); -const u32 gEventObjectPic_Woman6_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/1.4bpp"); -const u32 gEventObjectPic_Woman6_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/2.4bpp"); -const u32 gEventObjectPic_Woman6_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/3.4bpp"); -const u32 gEventObjectPic_Woman6_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/4.4bpp"); -const u32 gEventObjectPic_Woman6_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/5.4bpp"); -const u32 gEventObjectPic_Woman6_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/6.4bpp"); -const u32 gEventObjectPic_Woman6_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/7.4bpp"); -const u32 gEventObjectPic_Woman6_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/8.4bpp"); -const u32 gEventObjectPic_OldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/0.4bpp"); -const u32 gEventObjectPic_OldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/1.4bpp"); -const u32 gEventObjectPic_OldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/2.4bpp"); -const u32 gEventObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/0.4bpp"); -const u32 gEventObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/1.4bpp"); -const u32 gEventObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/2.4bpp"); -const u32 gEventObjectPic_Camper_0[] = INCBIN_U32("graphics/event_objects/pics/people/camper/0.4bpp"); -const u32 gEventObjectPic_Camper_1[] = INCBIN_U32("graphics/event_objects/pics/people/camper/1.4bpp"); -const u32 gEventObjectPic_Camper_2[] = INCBIN_U32("graphics/event_objects/pics/people/camper/2.4bpp"); -const u32 gEventObjectPic_Camper_3[] = INCBIN_U32("graphics/event_objects/pics/people/camper/3.4bpp"); -const u32 gEventObjectPic_Camper_4[] = INCBIN_U32("graphics/event_objects/pics/people/camper/4.4bpp"); -const u32 gEventObjectPic_Camper_5[] = INCBIN_U32("graphics/event_objects/pics/people/camper/5.4bpp"); -const u32 gEventObjectPic_Camper_6[] = INCBIN_U32("graphics/event_objects/pics/people/camper/6.4bpp"); -const u32 gEventObjectPic_Camper_7[] = INCBIN_U32("graphics/event_objects/pics/people/camper/7.4bpp"); -const u32 gEventObjectPic_Camper_8[] = INCBIN_U32("graphics/event_objects/pics/people/camper/8.4bpp"); -const u32 gEventObjectPic_Picnicker_0[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/0.4bpp"); -const u32 gEventObjectPic_Picnicker_1[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/1.4bpp"); -const u32 gEventObjectPic_Picnicker_2[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/2.4bpp"); -const u32 gEventObjectPic_Picnicker_3[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/3.4bpp"); -const u32 gEventObjectPic_Picnicker_4[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/4.4bpp"); -const u32 gEventObjectPic_Picnicker_5[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/5.4bpp"); -const u32 gEventObjectPic_Picnicker_6[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/6.4bpp"); -const u32 gEventObjectPic_Picnicker_7[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/7.4bpp"); -const u32 gEventObjectPic_Picnicker_8[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/8.4bpp"); -const u32 gEventObjectPic_Man4_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/0.4bpp"); -const u32 gEventObjectPic_Man4_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/1.4bpp"); -const u32 gEventObjectPic_Man4_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/2.4bpp"); -const u32 gEventObjectPic_Man4_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/3.4bpp"); -const u32 gEventObjectPic_Man4_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/4.4bpp"); -const u32 gEventObjectPic_Man4_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/5.4bpp"); -const u32 gEventObjectPic_Man4_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/6.4bpp"); -const u32 gEventObjectPic_Man4_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/7.4bpp"); -const u32 gEventObjectPic_Man4_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/8.4bpp"); -const u32 gEventObjectPic_Woman7_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/0.4bpp"); -const u32 gEventObjectPic_Woman7_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/1.4bpp"); -const u32 gEventObjectPic_Woman7_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/2.4bpp"); -const u32 gEventObjectPic_Woman7_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/3.4bpp"); -const u32 gEventObjectPic_Woman7_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/4.4bpp"); -const u32 gEventObjectPic_Woman7_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/5.4bpp"); -const u32 gEventObjectPic_Woman7_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/6.4bpp"); -const u32 gEventObjectPic_Woman7_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/7.4bpp"); -const u32 gEventObjectPic_Woman7_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/8.4bpp"); -const u32 gEventObjectPic_Youngster_0[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/0.4bpp"); -const u32 gEventObjectPic_Youngster_1[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/1.4bpp"); -const u32 gEventObjectPic_Youngster_2[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/2.4bpp"); -const u32 gEventObjectPic_Youngster_3[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/3.4bpp"); -const u32 gEventObjectPic_Youngster_4[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/4.4bpp"); -const u32 gEventObjectPic_Youngster_5[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/5.4bpp"); -const u32 gEventObjectPic_Youngster_6[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/6.4bpp"); -const u32 gEventObjectPic_Youngster_7[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/7.4bpp"); -const u32 gEventObjectPic_Youngster_8[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/8.4bpp"); -const u32 gEventObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/0.4bpp"); -const u32 gEventObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/1.4bpp"); -const u32 gEventObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/2.4bpp"); -const u32 gEventObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/3.4bpp"); -const u32 gEventObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/4.4bpp"); -const u32 gEventObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/5.4bpp"); -const u32 gEventObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/6.4bpp"); -const u32 gEventObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/7.4bpp"); -const u32 gEventObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/8.4bpp"); -const u32 gEventObjectPic_PsychicM_0[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/0.4bpp"); -const u32 gEventObjectPic_PsychicM_1[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/1.4bpp"); -const u32 gEventObjectPic_PsychicM_2[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/2.4bpp"); -const u32 gEventObjectPic_PsychicM_3[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/3.4bpp"); -const u32 gEventObjectPic_PsychicM_4[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/4.4bpp"); -const u32 gEventObjectPic_PsychicM_5[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/5.4bpp"); -const u32 gEventObjectPic_PsychicM_6[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/6.4bpp"); -const u32 gEventObjectPic_PsychicM_7[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/7.4bpp"); -const u32 gEventObjectPic_PsychicM_8[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/8.4bpp"); -const u32 gEventObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/0.4bpp"); -const u32 gEventObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/1.4bpp"); -const u32 gEventObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/2.4bpp"); -const u32 gEventObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/3.4bpp"); -const u32 gEventObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/4.4bpp"); -const u32 gEventObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/5.4bpp"); -const u32 gEventObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/6.4bpp"); -const u32 gEventObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/7.4bpp"); -const u32 gEventObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/8.4bpp"); -const u32 gEventObjectPic_Maniac_0[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/0.4bpp"); -const u32 gEventObjectPic_Maniac_1[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/1.4bpp"); -const u32 gEventObjectPic_Maniac_2[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/2.4bpp"); -const u32 gEventObjectPic_Maniac_3[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/3.4bpp"); -const u32 gEventObjectPic_Maniac_4[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/4.4bpp"); -const u32 gEventObjectPic_Maniac_5[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/5.4bpp"); -const u32 gEventObjectPic_Maniac_6[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/6.4bpp"); -const u32 gEventObjectPic_Maniac_7[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/7.4bpp"); -const u32 gEventObjectPic_Maniac_8[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/8.4bpp"); -const u32 gEventObjectPic_HexManiac_0[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/0.4bpp"); -const u32 gEventObjectPic_HexManiac_1[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/1.4bpp"); -const u32 gEventObjectPic_HexManiac_2[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/2.4bpp"); -const u32 gEventObjectPic_HexManiac_3[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/3.4bpp"); -const u32 gEventObjectPic_HexManiac_4[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/4.4bpp"); -const u32 gEventObjectPic_HexManiac_5[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/5.4bpp"); -const u32 gEventObjectPic_HexManiac_6[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/6.4bpp"); -const u32 gEventObjectPic_HexManiac_7[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/7.4bpp"); -const u32 gEventObjectPic_HexManiac_8[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/8.4bpp"); -const u32 gEventObjectPic_Woman8_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/0.4bpp"); -const u32 gEventObjectPic_Woman8_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/1.4bpp"); -const u32 gEventObjectPic_Woman8_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/2.4bpp"); -const u32 gEventObjectPic_Woman8_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/3.4bpp"); -const u32 gEventObjectPic_Woman8_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/4.4bpp"); -const u32 gEventObjectPic_Woman8_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/5.4bpp"); -const u32 gEventObjectPic_Woman8_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/6.4bpp"); -const u32 gEventObjectPic_Woman8_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/7.4bpp"); -const u32 gEventObjectPic_Woman8_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/8.4bpp"); -const u32 gEventObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/0.4bpp"); -const u32 gEventObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/1.4bpp"); -const u32 gEventObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/2.4bpp"); -const u32 gEventObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/3.4bpp"); -const u32 gEventObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/4.4bpp"); -const u32 gEventObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/5.4bpp"); -const u32 gEventObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/6.4bpp"); -const u32 gEventObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/7.4bpp"); -const u32 gEventObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/8.4bpp"); -const u32 gEventObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/0.4bpp"); -const u32 gEventObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/1.4bpp"); -const u32 gEventObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/2.4bpp"); -const u32 gEventObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/3.4bpp"); -const u32 gEventObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/4.4bpp"); -const u32 gEventObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/5.4bpp"); -const u32 gEventObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/6.4bpp"); -const u32 gEventObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/7.4bpp"); -const u32 gEventObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/8.4bpp"); -const u32 gEventObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/0.4bpp"); -const u32 gEventObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/1.4bpp"); -const u32 gEventObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/2.4bpp"); -const u32 gEventObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/3.4bpp"); -const u32 gEventObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/4.4bpp"); -const u32 gEventObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/5.4bpp"); -const u32 gEventObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/6.4bpp"); -const u32 gEventObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/7.4bpp"); -const u32 gEventObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/8.4bpp"); -const u32 gEventObjectPic_Beauty_0[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/0.4bpp"); -const u32 gEventObjectPic_Beauty_1[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/1.4bpp"); -const u32 gEventObjectPic_Beauty_2[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/2.4bpp"); -const u32 gEventObjectPic_Beauty_3[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/3.4bpp"); -const u32 gEventObjectPic_Beauty_4[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/4.4bpp"); -const u32 gEventObjectPic_Beauty_5[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/5.4bpp"); -const u32 gEventObjectPic_Beauty_6[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/6.4bpp"); -const u32 gEventObjectPic_Beauty_7[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/7.4bpp"); -const u32 gEventObjectPic_Beauty_8[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/8.4bpp"); -const u32 gEventObjectPic_Scientist1_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/0.4bpp"); -const u32 gEventObjectPic_Scientist1_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/1.4bpp"); -const u32 gEventObjectPic_Scientist1_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/2.4bpp"); -const u32 gEventObjectPic_Scientist1_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/3.4bpp"); -const u32 gEventObjectPic_Scientist1_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/4.4bpp"); -const u32 gEventObjectPic_Scientist1_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/5.4bpp"); -const u32 gEventObjectPic_Scientist1_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/6.4bpp"); -const u32 gEventObjectPic_Scientist1_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/7.4bpp"); -const u32 gEventObjectPic_Scientist1_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/8.4bpp"); -const u32 gEventObjectPic_Lass_0[] = INCBIN_U32("graphics/event_objects/pics/people/lass/0.4bpp"); -const u32 gEventObjectPic_Lass_1[] = INCBIN_U32("graphics/event_objects/pics/people/lass/1.4bpp"); -const u32 gEventObjectPic_Lass_2[] = INCBIN_U32("graphics/event_objects/pics/people/lass/2.4bpp"); -const u32 gEventObjectPic_Lass_3[] = INCBIN_U32("graphics/event_objects/pics/people/lass/3.4bpp"); -const u32 gEventObjectPic_Lass_4[] = INCBIN_U32("graphics/event_objects/pics/people/lass/4.4bpp"); -const u32 gEventObjectPic_Lass_5[] = INCBIN_U32("graphics/event_objects/pics/people/lass/5.4bpp"); -const u32 gEventObjectPic_Lass_6[] = INCBIN_U32("graphics/event_objects/pics/people/lass/6.4bpp"); -const u32 gEventObjectPic_Lass_7[] = INCBIN_U32("graphics/event_objects/pics/people/lass/7.4bpp"); -const u32 gEventObjectPic_Lass_8[] = INCBIN_U32("graphics/event_objects/pics/people/lass/8.4bpp"); -const u32 gEventObjectPic_Gentleman_0[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/0.4bpp"); -const u32 gEventObjectPic_Gentleman_1[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/1.4bpp"); -const u32 gEventObjectPic_Gentleman_2[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/2.4bpp"); -const u32 gEventObjectPic_Gentleman_3[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/3.4bpp"); -const u32 gEventObjectPic_Gentleman_4[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/4.4bpp"); -const u32 gEventObjectPic_Gentleman_5[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/5.4bpp"); -const u32 gEventObjectPic_Gentleman_6[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/6.4bpp"); -const u32 gEventObjectPic_Gentleman_7[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/7.4bpp"); -const u32 gEventObjectPic_Gentleman_8[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/8.4bpp"); -const u32 gEventObjectPic_Sailor_0[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/0.4bpp"); -const u32 gEventObjectPic_Sailor_1[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/1.4bpp"); -const u32 gEventObjectPic_Sailor_2[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/2.4bpp"); -const u32 gEventObjectPic_Sailor_3[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/3.4bpp"); -const u32 gEventObjectPic_Sailor_4[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/4.4bpp"); -const u32 gEventObjectPic_Sailor_5[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/5.4bpp"); -const u32 gEventObjectPic_Sailor_6[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/6.4bpp"); -const u32 gEventObjectPic_Sailor_7[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/7.4bpp"); -const u32 gEventObjectPic_Sailor_8[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/8.4bpp"); -const u32 gEventObjectPic_Fisherman_0[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/0.4bpp"); -const u32 gEventObjectPic_Fisherman_1[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/1.4bpp"); -const u32 gEventObjectPic_Fisherman_2[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/2.4bpp"); -const u32 gEventObjectPic_Fisherman_3[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/3.4bpp"); -const u32 gEventObjectPic_Fisherman_4[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/4.4bpp"); -const u32 gEventObjectPic_Fisherman_5[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/5.4bpp"); -const u32 gEventObjectPic_Fisherman_6[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/6.4bpp"); -const u32 gEventObjectPic_Fisherman_7[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/7.4bpp"); -const u32 gEventObjectPic_Fisherman_8[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/8.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/0.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/1.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/2.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/3.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/4.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/5.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/6.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/7.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/8.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/0.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/1.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/2.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/3.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/4.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/5.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/6.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/7.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/8.4bpp"); -const u32 gEventObjectPic_TuberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/0.4bpp"); -const u32 gEventObjectPic_TuberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/1.4bpp"); -const u32 gEventObjectPic_TuberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/2.4bpp"); -const u32 gEventObjectPic_TuberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/3.4bpp"); -const u32 gEventObjectPic_TuberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/4.4bpp"); -const u32 gEventObjectPic_TuberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/5.4bpp"); -const u32 gEventObjectPic_TuberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/6.4bpp"); -const u32 gEventObjectPic_TuberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/7.4bpp"); -const u32 gEventObjectPic_TuberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/8.4bpp"); -const u32 gEventObjectPic_TuberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/0.4bpp"); -const u32 gEventObjectPic_TuberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/1.4bpp"); -const u32 gEventObjectPic_TuberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/2.4bpp"); -const u32 gEventObjectPic_TuberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/3.4bpp"); -const u32 gEventObjectPic_TuberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/4.4bpp"); -const u32 gEventObjectPic_TuberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/5.4bpp"); -const u32 gEventObjectPic_TuberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/6.4bpp"); -const u32 gEventObjectPic_TuberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/7.4bpp"); -const u32 gEventObjectPic_TuberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/8.4bpp"); -const u32 gEventObjectPic_Hiker_0[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/0.4bpp"); -const u32 gEventObjectPic_Hiker_1[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/1.4bpp"); -const u32 gEventObjectPic_Hiker_2[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/2.4bpp"); -const u32 gEventObjectPic_Hiker_3[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/3.4bpp"); -const u32 gEventObjectPic_Hiker_4[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/4.4bpp"); -const u32 gEventObjectPic_Hiker_5[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/5.4bpp"); -const u32 gEventObjectPic_Hiker_6[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/6.4bpp"); -const u32 gEventObjectPic_Hiker_7[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/7.4bpp"); -const u32 gEventObjectPic_Hiker_8[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/8.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/0.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/1.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/2.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/3.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/4.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/5.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/6.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/7.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/8.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/0.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/1.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/2.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/3.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/4.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/5.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/6.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/7.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/8.4bpp"); -const u32 gEventObjectPic_Man5_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/0.4bpp"); -const u32 gEventObjectPic_Man5_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/1.4bpp"); -const u32 gEventObjectPic_Man5_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/2.4bpp"); -const u32 gEventObjectPic_Man5_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/3.4bpp"); -const u32 gEventObjectPic_Man5_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/4.4bpp"); -const u32 gEventObjectPic_Man5_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/5.4bpp"); -const u32 gEventObjectPic_Man5_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/6.4bpp"); -const u32 gEventObjectPic_Man5_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/7.4bpp"); -const u32 gEventObjectPic_Man5_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/8.4bpp"); -const u32 gEventObjectPic_Man6_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/0.4bpp"); -const u32 gEventObjectPic_Man6_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/1.4bpp"); -const u32 gEventObjectPic_Man6_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/2.4bpp"); -const u32 gEventObjectPic_Man6_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/3.4bpp"); -const u32 gEventObjectPic_Man6_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/4.4bpp"); -const u32 gEventObjectPic_Man6_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/5.4bpp"); -const u32 gEventObjectPic_Man6_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/6.4bpp"); -const u32 gEventObjectPic_Man6_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/7.4bpp"); -const u32 gEventObjectPic_Man6_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/8.4bpp"); -const u32 gEventObjectPic_Nurse_0[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/0.4bpp"); -const u32 gEventObjectPic_Nurse_1[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/1.4bpp"); -const u32 gEventObjectPic_Nurse_2[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/2.4bpp"); -const u32 gEventObjectPic_Nurse_3[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/3.4bpp"); -const u32 gEventObjectPic_Nurse_4[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/4.4bpp"); -const u32 gEventObjectPic_Nurse_5[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/5.4bpp"); -const u32 gEventObjectPic_Nurse_6[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/6.4bpp"); -const u32 gEventObjectPic_Nurse_7[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/7.4bpp"); -const u32 gEventObjectPic_Nurse_8[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/8.4bpp"); -const u32 gEventObjectPic_Nurse_9[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/9.4bpp"); +const u32 gEventObjectPic_LittleBoy1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1.4bpp"); +const u32 gEventObjectPic_LittleGirl1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1.4bpp"); +const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); +const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); +const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); +const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); +const u32 gEventObjectPic_LittleBoy2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2.4bpp"); +const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.4bpp"); +const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); +const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); +const u32 gEventObjectPic_Boy4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4.4bpp"); +const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); +const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); +const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); +const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); +const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); +const u32 gEventObjectPic_OldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1.4bpp"); +const u32 gEventObjectPic_OldWoman1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1.4bpp"); +const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); +const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); +const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); +const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); +const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); +const u32 gEventObjectPic_Woman6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6.4bpp"); +const u32 gEventObjectPic_OldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2.4bpp"); +const u32 gEventObjectPic_OldWoman2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2.4bpp"); +const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); +const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); +const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); +const u32 gEventObjectPic_Woman7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7.4bpp"); +const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); +const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); +const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); +const u32 gEventObjectPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); +const u32 gEventObjectPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); +const u32 gEventObjectPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); +const u32 gEventObjectPic_Woman8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8.4bpp"); +const u32 gEventObjectPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); +const u32 gEventObjectPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); +const u32 gEventObjectPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); +const u32 gEventObjectPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); +const u32 gEventObjectPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); +const u32 gEventObjectPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); +const u32 gEventObjectPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); +const u32 gEventObjectPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); +const u32 gEventObjectPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); +const u32 gEventObjectPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); +const u32 gEventObjectPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); +const u32 gEventObjectPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); +const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); +const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); +const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); +const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); +const u32 gEventObjectPic_Man6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6.4bpp"); +const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); -const u32 gEventObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/0.4bpp"); -const u32 gEventObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/1.4bpp"); -const u32 gEventObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/2.4bpp"); -const u32 gEventObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/3.4bpp"); -const u32 gEventObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/4.4bpp"); -const u32 gEventObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/5.4bpp"); -const u32 gEventObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/6.4bpp"); -const u32 gEventObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/7.4bpp"); -const u32 gEventObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/8.4bpp"); -const u32 gEventObjectPic_ReporterM_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/0.4bpp"); -const u32 gEventObjectPic_ReporterM_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/1.4bpp"); -const u32 gEventObjectPic_ReporterM_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/2.4bpp"); -const u32 gEventObjectPic_ReporterM_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/3.4bpp"); -const u32 gEventObjectPic_ReporterM_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/4.4bpp"); -const u32 gEventObjectPic_ReporterM_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/5.4bpp"); -const u32 gEventObjectPic_ReporterM_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/6.4bpp"); -const u32 gEventObjectPic_ReporterM_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/7.4bpp"); -const u32 gEventObjectPic_ReporterM_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/8.4bpp"); -const u32 gEventObjectPic_ReporterF_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/0.4bpp"); -const u32 gEventObjectPic_ReporterF_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/1.4bpp"); -const u32 gEventObjectPic_ReporterF_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/2.4bpp"); -const u32 gEventObjectPic_ReporterF_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/3.4bpp"); -const u32 gEventObjectPic_ReporterF_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/4.4bpp"); -const u32 gEventObjectPic_ReporterF_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/5.4bpp"); -const u32 gEventObjectPic_ReporterF_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/6.4bpp"); -const u32 gEventObjectPic_ReporterF_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/7.4bpp"); -const u32 gEventObjectPic_ReporterF_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/8.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/0.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/1.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/2.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/3.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/4.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/5.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/6.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/7.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/8.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/0.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/1.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/2.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/3.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/4.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/5.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/6.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/7.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/8.4bpp"); -const u32 gEventObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/0.4bpp"); -const u32 gEventObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/1.4bpp"); -const u32 gEventObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/2.4bpp"); -const u32 gEventObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/3.4bpp"); -const u32 gEventObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/4.4bpp"); -const u32 gEventObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/5.4bpp"); -const u32 gEventObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/6.4bpp"); -const u32 gEventObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/7.4bpp"); -const u32 gEventObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/8.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/0.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/1.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/2.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/3.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/4.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/5.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/6.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/7.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/8.4bpp"); -const u32 gEventObjectPic_Teala_0[] = INCBIN_U32("graphics/event_objects/pics/people/teala/0.4bpp"); -const u32 gEventObjectPic_Teala_1[] = INCBIN_U32("graphics/event_objects/pics/people/teala/1.4bpp"); -const u32 gEventObjectPic_Teala_2[] = INCBIN_U32("graphics/event_objects/pics/people/teala/2.4bpp"); -const u32 gEventObjectPic_Teala_3[] = INCBIN_U32("graphics/event_objects/pics/people/teala/3.4bpp"); -const u32 gEventObjectPic_Teala_4[] = INCBIN_U32("graphics/event_objects/pics/people/teala/4.4bpp"); -const u32 gEventObjectPic_Teala_5[] = INCBIN_U32("graphics/event_objects/pics/people/teala/5.4bpp"); -const u32 gEventObjectPic_Teala_6[] = INCBIN_U32("graphics/event_objects/pics/people/teala/6.4bpp"); -const u32 gEventObjectPic_Teala_7[] = INCBIN_U32("graphics/event_objects/pics/people/teala/7.4bpp"); -const u32 gEventObjectPic_Teala_8[] = INCBIN_U32("graphics/event_objects/pics/people/teala/8.4bpp"); -const u32 gEventObjectPic_Artist_0[] = INCBIN_U32("graphics/event_objects/pics/people/artist/0.4bpp"); -const u32 gEventObjectPic_Artist_1[] = INCBIN_U32("graphics/event_objects/pics/people/artist/1.4bpp"); -const u32 gEventObjectPic_Artist_2[] = INCBIN_U32("graphics/event_objects/pics/people/artist/2.4bpp"); -const u32 gEventObjectPic_Artist_3[] = INCBIN_U32("graphics/event_objects/pics/people/artist/3.4bpp"); -const u32 gEventObjectPic_Artist_4[] = INCBIN_U32("graphics/event_objects/pics/people/artist/4.4bpp"); -const u32 gEventObjectPic_Artist_5[] = INCBIN_U32("graphics/event_objects/pics/people/artist/5.4bpp"); -const u32 gEventObjectPic_Artist_6[] = INCBIN_U32("graphics/event_objects/pics/people/artist/6.4bpp"); -const u32 gEventObjectPic_Artist_7[] = INCBIN_U32("graphics/event_objects/pics/people/artist/7.4bpp"); -const u32 gEventObjectPic_Artist_8[] = INCBIN_U32("graphics/event_objects/pics/people/artist/8.4bpp"); -const u32 gEventObjectPic_Cameraman_0[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/0.4bpp"); -const u32 gEventObjectPic_Cameraman_1[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/1.4bpp"); -const u32 gEventObjectPic_Cameraman_2[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/2.4bpp"); -const u32 gEventObjectPic_Cameraman_3[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/3.4bpp"); -const u32 gEventObjectPic_Cameraman_4[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/4.4bpp"); -const u32 gEventObjectPic_Cameraman_5[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/5.4bpp"); -const u32 gEventObjectPic_Cameraman_6[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/6.4bpp"); -const u32 gEventObjectPic_Cameraman_7[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/7.4bpp"); -const u32 gEventObjectPic_Cameraman_8[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/8.4bpp"); -const u32 gEventObjectPic_Scientist2_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/0.4bpp"); -const u32 gEventObjectPic_Scientist2_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/1.4bpp"); -const u32 gEventObjectPic_Scientist2_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/2.4bpp"); -const u32 gEventObjectPic_Scientist2_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/3.4bpp"); -const u32 gEventObjectPic_Scientist2_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/4.4bpp"); -const u32 gEventObjectPic_Scientist2_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/5.4bpp"); -const u32 gEventObjectPic_Scientist2_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/6.4bpp"); -const u32 gEventObjectPic_Scientist2_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/7.4bpp"); -const u32 gEventObjectPic_Scientist2_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/8.4bpp"); -const u32 gEventObjectPic_Man7_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/0.4bpp"); -const u32 gEventObjectPic_Man7_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/1.4bpp"); -const u32 gEventObjectPic_Man7_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/2.4bpp"); -const u32 gEventObjectPic_Man7_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/3.4bpp"); -const u32 gEventObjectPic_Man7_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/4.4bpp"); -const u32 gEventObjectPic_Man7_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/5.4bpp"); -const u32 gEventObjectPic_Man7_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/6.4bpp"); -const u32 gEventObjectPic_Man7_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/7.4bpp"); -const u32 gEventObjectPic_Man7_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/8.4bpp"); -const u32 gEventObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/0.4bpp"); -const u32 gEventObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/1.4bpp"); -const u32 gEventObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/2.4bpp"); -const u32 gEventObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/3.4bpp"); -const u32 gEventObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/4.4bpp"); -const u32 gEventObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/5.4bpp"); -const u32 gEventObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/6.4bpp"); -const u32 gEventObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/7.4bpp"); -const u32 gEventObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/8.4bpp"); -const u32 gEventObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/0.4bpp"); -const u32 gEventObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/1.4bpp"); -const u32 gEventObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/2.4bpp"); -const u32 gEventObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/3.4bpp"); -const u32 gEventObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/4.4bpp"); -const u32 gEventObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/5.4bpp"); -const u32 gEventObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/6.4bpp"); -const u32 gEventObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/7.4bpp"); -const u32 gEventObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/8.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/0.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/1.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/2.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/3.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/4.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/5.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/6.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/7.4bpp"); -const u32 gEventObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/8.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/0.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/1.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/2.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/3.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/4.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/5.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/6.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/7.4bpp"); -const u32 gEventObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/8.4bpp"); -const u32 gEventObjectPic_Sidney_0[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/0.4bpp"); -const u32 gEventObjectPic_Sidney_1[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/1.4bpp"); -const u32 gEventObjectPic_Sidney_2[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/2.4bpp"); -const u32 gEventObjectPic_Phoebe_0[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/0.4bpp"); -const u32 gEventObjectPic_Phoebe_1[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/1.4bpp"); -const u32 gEventObjectPic_Phoebe_2[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/2.4bpp"); -const u32 gEventObjectPic_Glacia_0[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/0.4bpp"); -const u32 gEventObjectPic_Glacia_1[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/1.4bpp"); -const u32 gEventObjectPic_Glacia_2[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/2.4bpp"); -const u32 gEventObjectPic_Drake_0[] = INCBIN_U32("graphics/event_objects/pics/people/drake/0.4bpp"); -const u32 gEventObjectPic_Drake_1[] = INCBIN_U32("graphics/event_objects/pics/people/drake/1.4bpp"); -const u32 gEventObjectPic_Drake_2[] = INCBIN_U32("graphics/event_objects/pics/people/drake/2.4bpp"); -const u32 gEventObjectPic_Roxanne_0[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/0.4bpp"); -const u32 gEventObjectPic_Roxanne_1[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/1.4bpp"); -const u32 gEventObjectPic_Roxanne_2[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/2.4bpp"); -const u32 gEventObjectPic_Brawly_0[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/0.4bpp"); -const u32 gEventObjectPic_Brawly_1[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/1.4bpp"); -const u32 gEventObjectPic_Brawly_2[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/2.4bpp"); -const u32 gEventObjectPic_Wattson_0[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/0.4bpp"); -const u32 gEventObjectPic_Wattson_1[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/1.4bpp"); -const u32 gEventObjectPic_Wattson_2[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/2.4bpp"); -const u32 gEventObjectPic_Flannery_0[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/0.4bpp"); -const u32 gEventObjectPic_Flannery_1[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/1.4bpp"); -const u32 gEventObjectPic_Flannery_2[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/2.4bpp"); -const u32 gEventObjectPic_Norman_0[] = INCBIN_U32("graphics/event_objects/pics/people/norman/0.4bpp"); -const u32 gEventObjectPic_Norman_1[] = INCBIN_U32("graphics/event_objects/pics/people/norman/1.4bpp"); -const u32 gEventObjectPic_Norman_2[] = INCBIN_U32("graphics/event_objects/pics/people/norman/2.4bpp"); -const u32 gEventObjectPic_Norman_3[] = INCBIN_U32("graphics/event_objects/pics/people/norman/3.4bpp"); -const u32 gEventObjectPic_Norman_4[] = INCBIN_U32("graphics/event_objects/pics/people/norman/4.4bpp"); -const u32 gEventObjectPic_Norman_5[] = INCBIN_U32("graphics/event_objects/pics/people/norman/5.4bpp"); -const u32 gEventObjectPic_Norman_6[] = INCBIN_U32("graphics/event_objects/pics/people/norman/6.4bpp"); -const u32 gEventObjectPic_Norman_7[] = INCBIN_U32("graphics/event_objects/pics/people/norman/7.4bpp"); -const u32 gEventObjectPic_Norman_8[] = INCBIN_U32("graphics/event_objects/pics/people/norman/8.4bpp"); -const u32 gEventObjectPic_Winona_0[] = INCBIN_U32("graphics/event_objects/pics/people/winona/0.4bpp"); -const u32 gEventObjectPic_Winona_1[] = INCBIN_U32("graphics/event_objects/pics/people/winona/1.4bpp"); -const u32 gEventObjectPic_Winona_2[] = INCBIN_U32("graphics/event_objects/pics/people/winona/2.4bpp"); -const u32 gEventObjectPic_Liza_0[] = INCBIN_U32("graphics/event_objects/pics/people/liza/0.4bpp"); -const u32 gEventObjectPic_Liza_1[] = INCBIN_U32("graphics/event_objects/pics/people/liza/1.4bpp"); -const u32 gEventObjectPic_Liza_2[] = INCBIN_U32("graphics/event_objects/pics/people/liza/2.4bpp"); -const u32 gEventObjectPic_Tate_0[] = INCBIN_U32("graphics/event_objects/pics/people/tate/0.4bpp"); -const u32 gEventObjectPic_Tate_1[] = INCBIN_U32("graphics/event_objects/pics/people/tate/1.4bpp"); -const u32 gEventObjectPic_Tate_2[] = INCBIN_U32("graphics/event_objects/pics/people/tate/2.4bpp"); -const u32 gEventObjectPic_Wallace_0[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/0.4bpp"); -const u32 gEventObjectPic_Wallace_1[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/1.4bpp"); -const u32 gEventObjectPic_Wallace_2[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/2.4bpp"); -const u32 gEventObjectPic_Wallace_3[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/3.4bpp"); -const u32 gEventObjectPic_Wallace_4[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/4.4bpp"); -const u32 gEventObjectPic_Wallace_5[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/5.4bpp"); -const u32 gEventObjectPic_Wallace_6[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/6.4bpp"); -const u32 gEventObjectPic_Wallace_7[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/7.4bpp"); -const u32 gEventObjectPic_Wallace_8[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/8.4bpp"); -const u32 gEventObjectPic_Steven_0[] = INCBIN_U32("graphics/event_objects/pics/people/steven/0.4bpp"); -const u32 gEventObjectPic_Steven_1[] = INCBIN_U32("graphics/event_objects/pics/people/steven/1.4bpp"); -const u32 gEventObjectPic_Steven_2[] = INCBIN_U32("graphics/event_objects/pics/people/steven/2.4bpp"); -const u32 gEventObjectPic_Steven_3[] = INCBIN_U32("graphics/event_objects/pics/people/steven/3.4bpp"); -const u32 gEventObjectPic_Steven_4[] = INCBIN_U32("graphics/event_objects/pics/people/steven/4.4bpp"); -const u32 gEventObjectPic_Steven_5[] = INCBIN_U32("graphics/event_objects/pics/people/steven/5.4bpp"); -const u32 gEventObjectPic_Steven_6[] = INCBIN_U32("graphics/event_objects/pics/people/steven/6.4bpp"); -const u32 gEventObjectPic_Steven_7[] = INCBIN_U32("graphics/event_objects/pics/people/steven/7.4bpp"); -const u32 gEventObjectPic_Steven_8[] = INCBIN_U32("graphics/event_objects/pics/people/steven/8.4bpp"); -const u32 gEventObjectPic_Wally_0[] = INCBIN_U32("graphics/event_objects/pics/people/wally/0.4bpp"); -const u32 gEventObjectPic_Wally_1[] = INCBIN_U32("graphics/event_objects/pics/people/wally/1.4bpp"); -const u32 gEventObjectPic_Wally_2[] = INCBIN_U32("graphics/event_objects/pics/people/wally/2.4bpp"); -const u32 gEventObjectPic_Wally_3[] = INCBIN_U32("graphics/event_objects/pics/people/wally/3.4bpp"); -const u32 gEventObjectPic_Wally_4[] = INCBIN_U32("graphics/event_objects/pics/people/wally/4.4bpp"); -const u32 gEventObjectPic_Wally_5[] = INCBIN_U32("graphics/event_objects/pics/people/wally/5.4bpp"); -const u32 gEventObjectPic_Wally_6[] = INCBIN_U32("graphics/event_objects/pics/people/wally/6.4bpp"); -const u32 gEventObjectPic_Wally_7[] = INCBIN_U32("graphics/event_objects/pics/people/wally/7.4bpp"); -const u32 gEventObjectPic_Wally_8[] = INCBIN_U32("graphics/event_objects/pics/people/wally/8.4bpp"); -const u32 gEventObjectPic_LittleBoy3_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/0.4bpp"); -const u32 gEventObjectPic_LittleBoy3_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/1.4bpp"); -const u32 gEventObjectPic_LittleBoy3_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/2.4bpp"); -const u32 gEventObjectPic_LittleBoy3_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/3.4bpp"); -const u32 gEventObjectPic_LittleBoy3_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/4.4bpp"); -const u32 gEventObjectPic_LittleBoy3_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/5.4bpp"); -const u32 gEventObjectPic_LittleBoy3_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/6.4bpp"); -const u32 gEventObjectPic_LittleBoy3_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/7.4bpp"); -const u32 gEventObjectPic_LittleBoy3_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/8.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/0.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/1.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/2.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/3.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/4.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/5.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/6.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/7.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/8.4bpp"); -const u32 gEventObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/0.4bpp"); -const u32 gEventObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/1.4bpp"); -const u32 gEventObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/2.4bpp"); -const u32 gEventObjectPic_Boy5_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/0.4bpp"); -const u32 gEventObjectPic_Boy5_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/1.4bpp"); -const u32 gEventObjectPic_Boy5_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/2.4bpp"); -const u32 gEventObjectPic_ContestJudge_0[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/0.4bpp"); -const u32 gEventObjectPic_ContestJudge_1[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/1.4bpp"); -const u32 gEventObjectPic_ContestJudge_2[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/2.4bpp"); -const u32 gEventObjectPic_ContestJudge_3[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/3.4bpp"); -const u32 gEventObjectPic_ContestJudge_4[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/4.4bpp"); -const u32 gEventObjectPic_ContestJudge_5[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/5.4bpp"); -const u32 gEventObjectPic_ContestJudge_6[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/6.4bpp"); -const u32 gEventObjectPic_ContestJudge_7[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/7.4bpp"); -const u32 gEventObjectPic_ContestJudge_8[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/8.4bpp"); -const u32 gEventObjectPic_Archie_0[] = INCBIN_U32("graphics/event_objects/pics/people/archie/0.4bpp"); -const u32 gEventObjectPic_Archie_1[] = INCBIN_U32("graphics/event_objects/pics/people/archie/1.4bpp"); -const u32 gEventObjectPic_Archie_2[] = INCBIN_U32("graphics/event_objects/pics/people/archie/2.4bpp"); -const u32 gEventObjectPic_Archie_3[] = INCBIN_U32("graphics/event_objects/pics/people/archie/3.4bpp"); -const u32 gEventObjectPic_Archie_4[] = INCBIN_U32("graphics/event_objects/pics/people/archie/4.4bpp"); -const u32 gEventObjectPic_Archie_5[] = INCBIN_U32("graphics/event_objects/pics/people/archie/5.4bpp"); -const u32 gEventObjectPic_Archie_6[] = INCBIN_U32("graphics/event_objects/pics/people/archie/6.4bpp"); -const u32 gEventObjectPic_Archie_7[] = INCBIN_U32("graphics/event_objects/pics/people/archie/7.4bpp"); -const u32 gEventObjectPic_Archie_8[] = INCBIN_U32("graphics/event_objects/pics/people/archie/8.4bpp"); -const u32 gEventObjectPic_Maxie_0[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/0.4bpp"); -const u32 gEventObjectPic_Maxie_1[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/1.4bpp"); -const u32 gEventObjectPic_Maxie_2[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/2.4bpp"); -const u32 gEventObjectPic_Maxie_3[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/3.4bpp"); -const u32 gEventObjectPic_Maxie_4[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/4.4bpp"); -const u32 gEventObjectPic_Maxie_5[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/5.4bpp"); -const u32 gEventObjectPic_Maxie_6[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/6.4bpp"); -const u32 gEventObjectPic_Maxie_7[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/7.4bpp"); -const u32 gEventObjectPic_Maxie_8[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/8.4bpp"); -const u32 gEventObjectPic_Kyogre_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre/0.4bpp"); -const u32 gEventObjectPic_Kyogre_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre/1.4bpp"); -const u32 gEventObjectPic_Groudon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon/0.4bpp"); -const u32 gEventObjectPic_Groudon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon/1.4bpp"); +const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); +const u32 gEventObjectPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); +const u32 gEventObjectPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); +const u32 gEventObjectPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); +const u32 gEventObjectPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); +const u32 gEventObjectPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); +const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); +const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); +const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); +const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); +const u32 gEventObjectPic_Man7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7.4bpp"); +const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m.4bpp"); +const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f.4bpp"); +const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m.4bpp"); +const u32 gEventObjectPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f.4bpp"); +const u32 gEventObjectPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/sidney.4bpp"); +const u32 gEventObjectPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe.4bpp"); +const u32 gEventObjectPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/glacia.4bpp"); +const u32 gEventObjectPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/drake.4bpp"); +const u32 gEventObjectPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne.4bpp"); +const u32 gEventObjectPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/brawly.4bpp"); +const u32 gEventObjectPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/wattson.4bpp"); +const u32 gEventObjectPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/flannery.4bpp"); +const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/norman.4bpp"); +const u32 gEventObjectPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/winona.4bpp"); +const u32 gEventObjectPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/liza.4bpp"); +const u32 gEventObjectPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/tate.4bpp"); +const u32 gEventObjectPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); +const u32 gEventObjectPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); +const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); +const u32 gEventObjectPic_LittleBoy3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3.4bpp"); +const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); +const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); +const u32 gEventObjectPic_Boy5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5.4bpp"); +const u32 gEventObjectPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); +const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/archie.4bpp"); +const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/maxie.4bpp"); +const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); +const u32 gEventObjectPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); -const u32 gEventObjectPic_Skitty_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/0.4bpp"); -const u32 gEventObjectPic_Skitty_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/1.4bpp"); -const u32 gEventObjectPic_Skitty_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/2.4bpp"); -const u32 gEventObjectPic_Kecleon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/0.4bpp"); -const u32 gEventObjectPic_Kecleon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/1.4bpp"); -const u32 gEventObjectPic_Kecleon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/2.4bpp"); -const u32 gEventObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/0.4bpp"); -const u32 gEventObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/1.4bpp"); -const u32 gEventObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/0.4bpp"); -const u32 gEventObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/1.4bpp"); -const u32 gEventObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/2.4bpp"); -const u32 gEventObjectPic_Pikachu_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/0.4bpp"); -const u32 gEventObjectPic_Pikachu_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/1.4bpp"); -const u32 gEventObjectPic_Pikachu_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/2.4bpp"); -const u32 gEventObjectPic_Azumarill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/0.4bpp"); -const u32 gEventObjectPic_Azumarill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/1.4bpp"); -const u32 gEventObjectPic_Azumarill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/2.4bpp"); -const u32 gEventObjectPic_Wingull_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/0.4bpp"); -const u32 gEventObjectPic_Wingull_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/3.4bpp"); -const u32 gEventObjectPic_Wingull_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/1.4bpp"); -const u32 gEventObjectPic_Wingull_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/4.4bpp"); -const u32 gEventObjectPic_Wingull_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/2.4bpp"); -const u32 gEventObjectPic_Wingull_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/5.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/0.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/1.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/2.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/3.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/4.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/5.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/6.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/7.4bpp"); -const u32 gEventObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/8.4bpp"); -const u32 gEventObjectPic_Azurill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/0.4bpp"); -const u32 gEventObjectPic_Azurill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/1.4bpp"); -const u32 gEventObjectPic_Azurill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/2.4bpp"); -const u32 gEventObjectPic_Mom_0[] = INCBIN_U32("graphics/event_objects/pics/people/mom/0.4bpp"); -const u32 gEventObjectPic_Mom_1[] = INCBIN_U32("graphics/event_objects/pics/people/mom/1.4bpp"); -const u32 gEventObjectPic_Mom_2[] = INCBIN_U32("graphics/event_objects/pics/people/mom/2.4bpp"); -const u32 gEventObjectPic_Mom_3[] = INCBIN_U32("graphics/event_objects/pics/people/mom/3.4bpp"); -const u32 gEventObjectPic_Mom_4[] = INCBIN_U32("graphics/event_objects/pics/people/mom/4.4bpp"); -const u32 gEventObjectPic_Mom_5[] = INCBIN_U32("graphics/event_objects/pics/people/mom/5.4bpp"); -const u32 gEventObjectPic_Mom_6[] = INCBIN_U32("graphics/event_objects/pics/people/mom/6.4bpp"); -const u32 gEventObjectPic_Mom_7[] = INCBIN_U32("graphics/event_objects/pics/people/mom/7.4bpp"); -const u32 gEventObjectPic_Mom_8[] = INCBIN_U32("graphics/event_objects/pics/people/mom/8.4bpp"); +const u32 gEventObjectPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); +const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); +const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); +const u32 gEventObjectPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); +const u32 gEventObjectPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); +const u32 gEventObjectPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); +const u32 gEventObjectPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); +const u32 gEventObjectPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); +const u32 gEventObjectPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); +const u32 gEventObjectPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/22.gbapal"); const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/23.gbapal"); const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/24.gbapal"); @@ -1076,243 +225,60 @@ const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/ const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); -const u32 gEventObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/0.4bpp"); -const u32 gEventObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/1.4bpp"); -const u32 gEventObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/2.4bpp"); -const u32 gEventObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/3.4bpp"); -const u32 gEventObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/0.4bpp"); -const u32 gEventObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/1.4bpp"); -const u32 gEventObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/2.4bpp"); -const u32 gEventObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/3.4bpp"); +const u32 gEventObjectPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); +const u32 gEventObjectPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/0.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/1.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/2.4bpp"); +const u32 gEventObjectPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/26.gbapal"); const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/14.gbapal"); -const u32 gEventObjectPic_MachokeCarryingBox_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box/0.4bpp"); -const u32 gEventObjectPic_MachokeCarryingBox_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box/1.4bpp"); -const u32 gEventObjectPic_MachokeCarryingBox_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box/2.4bpp"); -const u32 gEventObjectPic_MachokeFacingAway_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away/0.4bpp"); -const u32 gEventObjectPic_MachokeFacingAway_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away/1.4bpp"); +const u32 gEventObjectPic_MachokeCarryingBox[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box.4bpp"); +const u32 gEventObjectPic_MachokeFacingAway[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away.4bpp"); const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/15.gbapal"); const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); -const u32 gEventObjectPic_Poochyena_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/0.4bpp"); -const u32 gEventObjectPic_Poochyena_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/1.4bpp"); -const u32 gEventObjectPic_Poochyena_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/2.4bpp"); -const u32 gEventObjectPic_Poochyena_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/3.4bpp"); -const u32 gEventObjectPic_Poochyena_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/4.4bpp"); -const u32 gEventObjectPic_Poochyena_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/5.4bpp"); -const u32 gEventObjectPic_Poochyena_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/6.4bpp"); -const u32 gEventObjectPic_Poochyena_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/7.4bpp"); -const u32 gEventObjectPic_Poochyena_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/8.4bpp"); +const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/16.gbapal"); const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/20.gbapal"); const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/21.gbapal"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/0.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/1.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/2.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/3.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/4.4bpp"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/5.4bpp"); +const u32 gFieldEffectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle.4bpp"); const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); -const u32 gEventObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/0.4bpp"); -const u32 gEventObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/1.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/0.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/1.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/2.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/3.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/4.4bpp"); -const u32 gEventObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/5.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/0.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/1.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/2.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/3.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/4.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/5.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/0.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/1.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/2.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/3.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/4.4bpp"); -const u32 gEventObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/5.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/0.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/1.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/2.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/3.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/4.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/5.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/0.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/1.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/2.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/3.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/4.4bpp"); -const u32 gEventObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/5.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/0.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/1.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/2.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/3.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/4.4bpp"); -const u32 gEventObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/5.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/0.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/1.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/2.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/3.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/4.4bpp"); -const u32 gEventObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/5.4bpp"); -const u32 gEventObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/0.4bpp"); -const u32 gEventObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/1.4bpp"); -const u32 gEventObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/2.4bpp"); -const u32 gEventObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/3.4bpp"); -const u32 gEventObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/4.4bpp"); -const u32 gEventObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/5.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/0.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/1.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/2.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/3.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/4.4bpp"); -const u32 gEventObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/5.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/0.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/1.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/2.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/3.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/4.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/5.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/0.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/1.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/2.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/3.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/4.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/5.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/0.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/1.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/2.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/3.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/4.4bpp"); -const u32 gEventObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/5.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/0.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/1.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/2.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/3.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/4.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/5.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/0.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/1.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/2.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/3.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/4.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/5.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/0.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/1.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/2.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/3.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/4.4bpp"); -const u32 gEventObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/5.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/0.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/1.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/2.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/3.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/4.4bpp"); -const u32 gEventObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/5.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/0.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/1.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/2.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/3.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/4.4bpp"); -const u32 gEventObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/5.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/0.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/1.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/2.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/3.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/4.4bpp"); -const u32 gEventObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/5.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/0.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/1.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/2.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/3.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/4.4bpp"); -const u32 gEventObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/5.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/0.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/1.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/2.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/3.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/4.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/5.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/0.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/1.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/2.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/3.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/4.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/5.4bpp"); -const u32 gEventObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/0.4bpp"); -const u32 gEventObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/1.4bpp"); -const u32 gEventObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/2.4bpp"); -const u32 gEventObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/3.4bpp"); -const u32 gEventObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/4.4bpp"); -const u32 gEventObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/5.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/0.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/1.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/2.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/3.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/4.4bpp"); -const u32 gEventObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/5.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/0.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/1.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/2.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/3.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/4.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/5.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/0.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/1.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/2.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/3.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/4.4bpp"); -const u32 gEventObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/5.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/0.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/1.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/2.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/3.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/4.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/5.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/0.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/1.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/2.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/3.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/4.4bpp"); -const u32 gEventObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/5.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/0.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/1.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/2.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/3.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/4.4bpp"); -const u32 gEventObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/5.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/0.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/1.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/2.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/3.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/4.4bpp"); -const u32 gEventObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/5.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/0.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/1.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/2.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/3.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/4.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/5.4bpp"); -const u32 gFieldEffectPic_SurfBlob_0[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/0.4bpp"); -const u32 gFieldEffectPic_SurfBlob_1[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/1.4bpp"); -const u32 gFieldEffectPic_SurfBlob_2[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/2.4bpp"); -const u32 gEventObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/0.4bpp"); -const u32 gEventObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/1.4bpp"); -const u32 gEventObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/2.4bpp"); -const u32 gEventObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/3.4bpp"); -const u32 gEventObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/4.4bpp"); -const u32 gEventObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/5.4bpp"); -const u32 gEventObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/6.4bpp"); +const u32 gEventObjectPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); +const u32 gEventObjectPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); +const u32 gEventObjectPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); +const u32 gEventObjectPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); +const u32 gEventObjectPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); +const u32 gEventObjectPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); +const u32 gEventObjectPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); +const u32 gEventObjectPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); +const u32 gEventObjectPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); +const u32 gEventObjectPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); +const u32 gEventObjectPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); +const u32 gEventObjectPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); +const u32 gEventObjectPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); +const u32 gEventObjectPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); +const u32 gEventObjectPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); +const u32 gEventObjectPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); +const u32 gEventObjectPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); +const u32 gEventObjectPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); +const u32 gEventObjectPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); +const u32 gEventObjectPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); +const u32 gEventObjectPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); +const u32 gEventObjectPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); +const u32 gEventObjectPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); +const u32 gEventObjectPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); +const u32 gEventObjectPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); +const u32 gEventObjectPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); +const u32 gEventObjectPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); +const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); +const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); +const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); +const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); +const u32 gFieldEffectPic_SurfBlob[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob.4bpp"); +const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/12.gbapal"); const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/13.gbapal"); diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index f7ed77f93..5a21a7f57 100644 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -6,1874 +6,1874 @@ #define POKERUBY_EVENT_OBJECT_PIC_TABLES_H const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = { - obj_frame_tiles(gEventObjectPic_BrendanNormal_0), - obj_frame_tiles(gEventObjectPic_BrendanNormal_1), - obj_frame_tiles(gEventObjectPic_BrendanNormal_2), - obj_frame_tiles(gEventObjectPic_BrendanNormal_3), - obj_frame_tiles(gEventObjectPic_BrendanNormal_4), - obj_frame_tiles(gEventObjectPic_BrendanNormal_5), - obj_frame_tiles(gEventObjectPic_BrendanNormal_6), - obj_frame_tiles(gEventObjectPic_BrendanNormal_7), - obj_frame_tiles(gEventObjectPic_BrendanNormal_8), - obj_frame_tiles(gEventObjectPic_BrendanNormal_9), - obj_frame_tiles(gEventObjectPic_BrendanNormal_10), - obj_frame_tiles(gEventObjectPic_BrendanNormal_11), - obj_frame_tiles(gEventObjectPic_BrendanNormal_12), - obj_frame_tiles(gEventObjectPic_BrendanNormal_13), - obj_frame_tiles(gEventObjectPic_BrendanNormal_14), - obj_frame_tiles(gEventObjectPic_BrendanNormal_15), - obj_frame_tiles(gEventObjectPic_BrendanNormal_16), - obj_frame_tiles(gEventObjectPic_BrendanNormal_17) + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 2), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 3), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 4), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 5), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 6), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 7), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 8), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 9), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 10), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 11), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 12), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 13), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 14), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 15), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 16), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 17) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = { - obj_frame_tiles(gEventObjectPic_BrendanMachBike_0), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_1), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_2), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_3), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_4), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_5), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_6), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_7), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_8) + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 6), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 7), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = { - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_0), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_1), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_2), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_3), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_4), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_5), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_6), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_7), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_8), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_9), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_10), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_11), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_12), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_13), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_14), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_15), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_16), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_17), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_18), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_19), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_20), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_21), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_22), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_23), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_24), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_25), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_26) + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 6), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 7), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 8), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 9), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 10), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 11), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 12), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 13), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 14), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 15), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 16), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 17), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 18), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 19), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 20), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 21), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 22), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 23), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 24), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 25), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 26) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = { - obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_3), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_4), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_5) + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 5) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = { - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2) + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = { - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_0), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_1), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_2), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_3), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_4) + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 4) }; const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { - obj_frame_tiles(gEventObjectPic_QuintyPlump_0), - obj_frame_tiles(gEventObjectPic_QuintyPlump_1), - obj_frame_tiles(gEventObjectPic_QuintyPlump_2), - obj_frame_tiles(gEventObjectPic_QuintyPlump_3), - obj_frame_tiles(gEventObjectPic_QuintyPlump_4), - obj_frame_tiles(gEventObjectPic_QuintyPlump_5), - obj_frame_tiles(gEventObjectPic_QuintyPlump_6) + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 0), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 1), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 2), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 3), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 4), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 5), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 6) }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = { - obj_frame_tiles(gEventObjectPic_LittleBoy1_0), - obj_frame_tiles(gEventObjectPic_LittleBoy1_1), - obj_frame_tiles(gEventObjectPic_LittleBoy1_2), - obj_frame_tiles(gEventObjectPic_LittleBoy1_3), - obj_frame_tiles(gEventObjectPic_LittleBoy1_4), - obj_frame_tiles(gEventObjectPic_LittleBoy1_5), - obj_frame_tiles(gEventObjectPic_LittleBoy1_6), - obj_frame_tiles(gEventObjectPic_LittleBoy1_7), - obj_frame_tiles(gEventObjectPic_LittleBoy1_8) + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = { - obj_frame_tiles(gEventObjectPic_LittleGirl1_0), - obj_frame_tiles(gEventObjectPic_LittleGirl1_1), - obj_frame_tiles(gEventObjectPic_LittleGirl1_2), - obj_frame_tiles(gEventObjectPic_LittleGirl1_3), - obj_frame_tiles(gEventObjectPic_LittleGirl1_4), - obj_frame_tiles(gEventObjectPic_LittleGirl1_5), - obj_frame_tiles(gEventObjectPic_LittleGirl1_6), - obj_frame_tiles(gEventObjectPic_LittleGirl1_7), - obj_frame_tiles(gEventObjectPic_LittleGirl1_8) + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 0), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 1), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 2), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 3), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 4), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 5), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 6), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 7), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { - obj_frame_tiles(gEventObjectPic_Boy1_0), - obj_frame_tiles(gEventObjectPic_Boy1_1), - obj_frame_tiles(gEventObjectPic_Boy1_2), - obj_frame_tiles(gEventObjectPic_Boy1_3), - obj_frame_tiles(gEventObjectPic_Boy1_4), - obj_frame_tiles(gEventObjectPic_Boy1_5), - obj_frame_tiles(gEventObjectPic_Boy1_6), - obj_frame_tiles(gEventObjectPic_Boy1_7), - obj_frame_tiles(gEventObjectPic_Boy1_8) + overworld_frame(gEventObjectPic_Boy1, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = { - obj_frame_tiles(gEventObjectPic_Girl1_0), - obj_frame_tiles(gEventObjectPic_Girl1_1), - obj_frame_tiles(gEventObjectPic_Girl1_2), - obj_frame_tiles(gEventObjectPic_Girl1_3), - obj_frame_tiles(gEventObjectPic_Girl1_4), - obj_frame_tiles(gEventObjectPic_Girl1_5), - obj_frame_tiles(gEventObjectPic_Girl1_6), - obj_frame_tiles(gEventObjectPic_Girl1_7), - obj_frame_tiles(gEventObjectPic_Girl1_8) + overworld_frame(gEventObjectPic_Girl1, 2, 4, 0), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 1), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 2), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 3), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 4), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 5), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 6), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 7), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = { - obj_frame_tiles(gEventObjectPic_Boy2_0), - obj_frame_tiles(gEventObjectPic_Boy2_1), - obj_frame_tiles(gEventObjectPic_Boy2_2), - obj_frame_tiles(gEventObjectPic_Boy2_3), - obj_frame_tiles(gEventObjectPic_Boy2_4), - obj_frame_tiles(gEventObjectPic_Boy2_5), - obj_frame_tiles(gEventObjectPic_Boy2_6), - obj_frame_tiles(gEventObjectPic_Boy2_7), - obj_frame_tiles(gEventObjectPic_Boy2_8) + overworld_frame(gEventObjectPic_Boy2, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { - obj_frame_tiles(gEventObjectPic_Girl2_0), - obj_frame_tiles(gEventObjectPic_Girl2_1), - obj_frame_tiles(gEventObjectPic_Girl2_2), - obj_frame_tiles(gEventObjectPic_Girl2_3), - obj_frame_tiles(gEventObjectPic_Girl2_4), - obj_frame_tiles(gEventObjectPic_Girl2_5), - obj_frame_tiles(gEventObjectPic_Girl2_6), - obj_frame_tiles(gEventObjectPic_Girl2_7), - obj_frame_tiles(gEventObjectPic_Girl2_8) + overworld_frame(gEventObjectPic_Girl2, 2, 4, 0), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 1), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 2), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 3), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 4), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 5), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 6), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 7), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = { - obj_frame_tiles(gEventObjectPic_LittleBoy2_0), - obj_frame_tiles(gEventObjectPic_LittleBoy2_1), - obj_frame_tiles(gEventObjectPic_LittleBoy2_2), - obj_frame_tiles(gEventObjectPic_LittleBoy2_3), - obj_frame_tiles(gEventObjectPic_LittleBoy2_4), - obj_frame_tiles(gEventObjectPic_LittleBoy2_5), - obj_frame_tiles(gEventObjectPic_LittleBoy2_6), - obj_frame_tiles(gEventObjectPic_LittleBoy2_7), - obj_frame_tiles(gEventObjectPic_LittleBoy2_8) + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = { - obj_frame_tiles(gEventObjectPic_LittleGirl2_0), - obj_frame_tiles(gEventObjectPic_LittleGirl2_1), - obj_frame_tiles(gEventObjectPic_LittleGirl2_2), - obj_frame_tiles(gEventObjectPic_LittleGirl2_3), - obj_frame_tiles(gEventObjectPic_LittleGirl2_4), - obj_frame_tiles(gEventObjectPic_LittleGirl2_5), - obj_frame_tiles(gEventObjectPic_LittleGirl2_6), - obj_frame_tiles(gEventObjectPic_LittleGirl2_7), - obj_frame_tiles(gEventObjectPic_LittleGirl2_8) + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { - obj_frame_tiles(gEventObjectPic_Boy3_0), - obj_frame_tiles(gEventObjectPic_Boy3_1), - obj_frame_tiles(gEventObjectPic_Boy3_2), - obj_frame_tiles(gEventObjectPic_Boy3_3), - obj_frame_tiles(gEventObjectPic_Boy3_4), - obj_frame_tiles(gEventObjectPic_Boy3_5), - obj_frame_tiles(gEventObjectPic_Boy3_6), - obj_frame_tiles(gEventObjectPic_Boy3_7), - obj_frame_tiles(gEventObjectPic_Boy3_8) + overworld_frame(gEventObjectPic_Boy3, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { - obj_frame_tiles(gEventObjectPic_Girl3_0), - obj_frame_tiles(gEventObjectPic_Girl3_1), - obj_frame_tiles(gEventObjectPic_Girl3_2), - obj_frame_tiles(gEventObjectPic_Girl3_3), - obj_frame_tiles(gEventObjectPic_Girl3_4), - obj_frame_tiles(gEventObjectPic_Girl3_5), - obj_frame_tiles(gEventObjectPic_Girl3_6), - obj_frame_tiles(gEventObjectPic_Girl3_7), - obj_frame_tiles(gEventObjectPic_Girl3_8) + overworld_frame(gEventObjectPic_Girl3, 2, 4, 0), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 1), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 2), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 3), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 4), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 5), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 6), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 7), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = { - obj_frame_tiles(gEventObjectPic_Boy4_0), - obj_frame_tiles(gEventObjectPic_Boy4_1), - obj_frame_tiles(gEventObjectPic_Boy4_2), - obj_frame_tiles(gEventObjectPic_Boy4_3), - obj_frame_tiles(gEventObjectPic_Boy4_4), - obj_frame_tiles(gEventObjectPic_Boy4_5), - obj_frame_tiles(gEventObjectPic_Boy4_6), - obj_frame_tiles(gEventObjectPic_Boy4_7), - obj_frame_tiles(gEventObjectPic_Boy4_8) + overworld_frame(gEventObjectPic_Boy4, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { - obj_frame_tiles(gEventObjectPic_Woman1_0), - obj_frame_tiles(gEventObjectPic_Woman1_1), - obj_frame_tiles(gEventObjectPic_Woman1_2), - obj_frame_tiles(gEventObjectPic_Woman1_3), - obj_frame_tiles(gEventObjectPic_Woman1_4), - obj_frame_tiles(gEventObjectPic_Woman1_5), - obj_frame_tiles(gEventObjectPic_Woman1_6), - obj_frame_tiles(gEventObjectPic_Woman1_7), - obj_frame_tiles(gEventObjectPic_Woman1_8) + overworld_frame(gEventObjectPic_Woman1, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { - obj_frame_tiles(gEventObjectPic_FatMan_0), - obj_frame_tiles(gEventObjectPic_FatMan_1), - obj_frame_tiles(gEventObjectPic_FatMan_2), - obj_frame_tiles(gEventObjectPic_FatMan_3), - obj_frame_tiles(gEventObjectPic_FatMan_4), - obj_frame_tiles(gEventObjectPic_FatMan_5), - obj_frame_tiles(gEventObjectPic_FatMan_6), - obj_frame_tiles(gEventObjectPic_FatMan_7), - obj_frame_tiles(gEventObjectPic_FatMan_8) + overworld_frame(gEventObjectPic_FatMan, 2, 4, 0), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 1), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 2), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 3), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 4), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 5), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 6), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 7), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { - obj_frame_tiles(gEventObjectPic_Woman2_0), - obj_frame_tiles(gEventObjectPic_Woman2_1), - obj_frame_tiles(gEventObjectPic_Woman2_2), - obj_frame_tiles(gEventObjectPic_Woman2_3), - obj_frame_tiles(gEventObjectPic_Woman2_4), - obj_frame_tiles(gEventObjectPic_Woman2_5), - obj_frame_tiles(gEventObjectPic_Woman2_6), - obj_frame_tiles(gEventObjectPic_Woman2_7), - obj_frame_tiles(gEventObjectPic_Woman2_8) + overworld_frame(gEventObjectPic_Woman2, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { - obj_frame_tiles(gEventObjectPic_Man1_0), - obj_frame_tiles(gEventObjectPic_Man1_1), - obj_frame_tiles(gEventObjectPic_Man1_2), - obj_frame_tiles(gEventObjectPic_Man1_3), - obj_frame_tiles(gEventObjectPic_Man1_4), - obj_frame_tiles(gEventObjectPic_Man1_5), - obj_frame_tiles(gEventObjectPic_Man1_6), - obj_frame_tiles(gEventObjectPic_Man1_7), - obj_frame_tiles(gEventObjectPic_Man1_8) + overworld_frame(gEventObjectPic_Man1, 2, 4, 0), + overworld_frame(gEventObjectPic_Man1, 2, 4, 1), + overworld_frame(gEventObjectPic_Man1, 2, 4, 2), + overworld_frame(gEventObjectPic_Man1, 2, 4, 3), + overworld_frame(gEventObjectPic_Man1, 2, 4, 4), + overworld_frame(gEventObjectPic_Man1, 2, 4, 5), + overworld_frame(gEventObjectPic_Man1, 2, 4, 6), + overworld_frame(gEventObjectPic_Man1, 2, 4, 7), + overworld_frame(gEventObjectPic_Man1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { - obj_frame_tiles(gEventObjectPic_Woman3_0), - obj_frame_tiles(gEventObjectPic_Woman3_1), - obj_frame_tiles(gEventObjectPic_Woman3_2), - obj_frame_tiles(gEventObjectPic_Woman3_3), - obj_frame_tiles(gEventObjectPic_Woman3_4), - obj_frame_tiles(gEventObjectPic_Woman3_5), - obj_frame_tiles(gEventObjectPic_Woman3_6), - obj_frame_tiles(gEventObjectPic_Woman3_7), - obj_frame_tiles(gEventObjectPic_Woman3_8) + overworld_frame(gEventObjectPic_Woman3, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = { - obj_frame_tiles(gEventObjectPic_OldMan1_0), - obj_frame_tiles(gEventObjectPic_OldMan1_1), - obj_frame_tiles(gEventObjectPic_OldMan1_2), - obj_frame_tiles(gEventObjectPic_OldMan1_3), - obj_frame_tiles(gEventObjectPic_OldMan1_4), - obj_frame_tiles(gEventObjectPic_OldMan1_5), - obj_frame_tiles(gEventObjectPic_OldMan1_6), - obj_frame_tiles(gEventObjectPic_OldMan1_7), - obj_frame_tiles(gEventObjectPic_OldMan1_8) + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 3), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 4), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 5), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 6), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 7), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = { - obj_frame_tiles(gEventObjectPic_OldWoman1_0), - obj_frame_tiles(gEventObjectPic_OldWoman1_1), - obj_frame_tiles(gEventObjectPic_OldWoman1_2), - obj_frame_tiles(gEventObjectPic_OldWoman1_3), - obj_frame_tiles(gEventObjectPic_OldWoman1_4), - obj_frame_tiles(gEventObjectPic_OldWoman1_5), - obj_frame_tiles(gEventObjectPic_OldWoman1_6), - obj_frame_tiles(gEventObjectPic_OldWoman1_7), - obj_frame_tiles(gEventObjectPic_OldWoman1_8) + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 2), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 3), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 4), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 5), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 6), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 7), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { - obj_frame_tiles(gEventObjectPic_Man2_0), - obj_frame_tiles(gEventObjectPic_Man2_1), - obj_frame_tiles(gEventObjectPic_Man2_2), - obj_frame_tiles(gEventObjectPic_Man2_3), - obj_frame_tiles(gEventObjectPic_Man2_4), - obj_frame_tiles(gEventObjectPic_Man2_5), - obj_frame_tiles(gEventObjectPic_Man2_6), - obj_frame_tiles(gEventObjectPic_Man2_7), - obj_frame_tiles(gEventObjectPic_Man2_8) + overworld_frame(gEventObjectPic_Man2, 2, 4, 0), + overworld_frame(gEventObjectPic_Man2, 2, 4, 1), + overworld_frame(gEventObjectPic_Man2, 2, 4, 2), + overworld_frame(gEventObjectPic_Man2, 2, 4, 3), + overworld_frame(gEventObjectPic_Man2, 2, 4, 4), + overworld_frame(gEventObjectPic_Man2, 2, 4, 5), + overworld_frame(gEventObjectPic_Man2, 2, 4, 6), + overworld_frame(gEventObjectPic_Man2, 2, 4, 7), + overworld_frame(gEventObjectPic_Man2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { - obj_frame_tiles(gEventObjectPic_Woman4_0), - obj_frame_tiles(gEventObjectPic_Woman4_1), - obj_frame_tiles(gEventObjectPic_Woman4_2), - obj_frame_tiles(gEventObjectPic_Woman4_3), - obj_frame_tiles(gEventObjectPic_Woman4_4), - obj_frame_tiles(gEventObjectPic_Woman4_5), - obj_frame_tiles(gEventObjectPic_Woman4_6), - obj_frame_tiles(gEventObjectPic_Woman4_7), - obj_frame_tiles(gEventObjectPic_Woman4_8) + overworld_frame(gEventObjectPic_Woman4, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { - obj_frame_tiles(gEventObjectPic_Man3_0), - obj_frame_tiles(gEventObjectPic_Man3_1), - obj_frame_tiles(gEventObjectPic_Man3_2), - obj_frame_tiles(gEventObjectPic_Man3_3), - obj_frame_tiles(gEventObjectPic_Man3_4), - obj_frame_tiles(gEventObjectPic_Man3_5), - obj_frame_tiles(gEventObjectPic_Man3_6), - obj_frame_tiles(gEventObjectPic_Man3_7), - obj_frame_tiles(gEventObjectPic_Man3_8) + overworld_frame(gEventObjectPic_Man3, 2, 4, 0), + overworld_frame(gEventObjectPic_Man3, 2, 4, 1), + overworld_frame(gEventObjectPic_Man3, 2, 4, 2), + overworld_frame(gEventObjectPic_Man3, 2, 4, 3), + overworld_frame(gEventObjectPic_Man3, 2, 4, 4), + overworld_frame(gEventObjectPic_Man3, 2, 4, 5), + overworld_frame(gEventObjectPic_Man3, 2, 4, 6), + overworld_frame(gEventObjectPic_Man3, 2, 4, 7), + overworld_frame(gEventObjectPic_Man3, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { - obj_frame_tiles(gEventObjectPic_Woman5_0), - obj_frame_tiles(gEventObjectPic_Woman5_1), - obj_frame_tiles(gEventObjectPic_Woman5_2), - obj_frame_tiles(gEventObjectPic_Woman5_3), - obj_frame_tiles(gEventObjectPic_Woman5_4), - obj_frame_tiles(gEventObjectPic_Woman5_5), - obj_frame_tiles(gEventObjectPic_Woman5_6), - obj_frame_tiles(gEventObjectPic_Woman5_7), - obj_frame_tiles(gEventObjectPic_Woman5_8) + overworld_frame(gEventObjectPic_Woman5, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { - obj_frame_tiles(gEventObjectPic_Cook_0), - obj_frame_tiles(gEventObjectPic_Cook_1), - obj_frame_tiles(gEventObjectPic_Cook_2), - obj_frame_tiles(gEventObjectPic_Cook_0), - obj_frame_tiles(gEventObjectPic_Cook_0), - obj_frame_tiles(gEventObjectPic_Cook_1), - obj_frame_tiles(gEventObjectPic_Cook_1), - obj_frame_tiles(gEventObjectPic_Cook_2), - obj_frame_tiles(gEventObjectPic_Cook_2) + overworld_frame(gEventObjectPic_Cook, 2, 4, 0), + overworld_frame(gEventObjectPic_Cook, 2, 4, 1), + overworld_frame(gEventObjectPic_Cook, 2, 4, 2), + overworld_frame(gEventObjectPic_Cook, 2, 4, 0), + overworld_frame(gEventObjectPic_Cook, 2, 4, 0), + overworld_frame(gEventObjectPic_Cook, 2, 4, 1), + overworld_frame(gEventObjectPic_Cook, 2, 4, 1), + overworld_frame(gEventObjectPic_Cook, 2, 4, 2), + overworld_frame(gEventObjectPic_Cook, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = { - obj_frame_tiles(gEventObjectPic_Woman6_0), - obj_frame_tiles(gEventObjectPic_Woman6_1), - obj_frame_tiles(gEventObjectPic_Woman6_2), - obj_frame_tiles(gEventObjectPic_Woman6_3), - obj_frame_tiles(gEventObjectPic_Woman6_4), - obj_frame_tiles(gEventObjectPic_Woman6_5), - obj_frame_tiles(gEventObjectPic_Woman6_6), - obj_frame_tiles(gEventObjectPic_Woman6_7), - obj_frame_tiles(gEventObjectPic_Woman6_8) + overworld_frame(gEventObjectPic_Woman6, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = { - obj_frame_tiles(gEventObjectPic_OldMan2_0), - obj_frame_tiles(gEventObjectPic_OldMan2_1), - obj_frame_tiles(gEventObjectPic_OldMan2_2), - obj_frame_tiles(gEventObjectPic_OldMan2_0), - obj_frame_tiles(gEventObjectPic_OldMan2_0), - obj_frame_tiles(gEventObjectPic_OldMan2_1), - obj_frame_tiles(gEventObjectPic_OldMan2_1), - obj_frame_tiles(gEventObjectPic_OldMan2_2), - obj_frame_tiles(gEventObjectPic_OldMan2_2) + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = { - obj_frame_tiles(gEventObjectPic_OldWoman2_0), - obj_frame_tiles(gEventObjectPic_OldWoman2_1), - obj_frame_tiles(gEventObjectPic_OldWoman2_2), - obj_frame_tiles(gEventObjectPic_OldWoman2_0), - obj_frame_tiles(gEventObjectPic_OldWoman2_0), - obj_frame_tiles(gEventObjectPic_OldWoman2_1), - obj_frame_tiles(gEventObjectPic_OldWoman2_1), - obj_frame_tiles(gEventObjectPic_OldWoman2_2), - obj_frame_tiles(gEventObjectPic_OldWoman2_2) + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { - obj_frame_tiles(gEventObjectPic_Camper_0), - obj_frame_tiles(gEventObjectPic_Camper_1), - obj_frame_tiles(gEventObjectPic_Camper_2), - obj_frame_tiles(gEventObjectPic_Camper_3), - obj_frame_tiles(gEventObjectPic_Camper_4), - obj_frame_tiles(gEventObjectPic_Camper_5), - obj_frame_tiles(gEventObjectPic_Camper_6), - obj_frame_tiles(gEventObjectPic_Camper_7), - obj_frame_tiles(gEventObjectPic_Camper_8) + overworld_frame(gEventObjectPic_Camper, 2, 4, 0), + overworld_frame(gEventObjectPic_Camper, 2, 4, 1), + overworld_frame(gEventObjectPic_Camper, 2, 4, 2), + overworld_frame(gEventObjectPic_Camper, 2, 4, 3), + overworld_frame(gEventObjectPic_Camper, 2, 4, 4), + overworld_frame(gEventObjectPic_Camper, 2, 4, 5), + overworld_frame(gEventObjectPic_Camper, 2, 4, 6), + overworld_frame(gEventObjectPic_Camper, 2, 4, 7), + overworld_frame(gEventObjectPic_Camper, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { - obj_frame_tiles(gEventObjectPic_Picnicker_0), - obj_frame_tiles(gEventObjectPic_Picnicker_1), - obj_frame_tiles(gEventObjectPic_Picnicker_2), - obj_frame_tiles(gEventObjectPic_Picnicker_3), - obj_frame_tiles(gEventObjectPic_Picnicker_4), - obj_frame_tiles(gEventObjectPic_Picnicker_5), - obj_frame_tiles(gEventObjectPic_Picnicker_6), - obj_frame_tiles(gEventObjectPic_Picnicker_7), - obj_frame_tiles(gEventObjectPic_Picnicker_8) + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 0), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 1), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 2), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 3), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 4), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 5), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 6), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 7), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { - obj_frame_tiles(gEventObjectPic_Man4_0), - obj_frame_tiles(gEventObjectPic_Man4_1), - obj_frame_tiles(gEventObjectPic_Man4_2), - obj_frame_tiles(gEventObjectPic_Man4_3), - obj_frame_tiles(gEventObjectPic_Man4_4), - obj_frame_tiles(gEventObjectPic_Man4_5), - obj_frame_tiles(gEventObjectPic_Man4_6), - obj_frame_tiles(gEventObjectPic_Man4_7), - obj_frame_tiles(gEventObjectPic_Man4_8) + overworld_frame(gEventObjectPic_Man4, 2, 4, 0), + overworld_frame(gEventObjectPic_Man4, 2, 4, 1), + overworld_frame(gEventObjectPic_Man4, 2, 4, 2), + overworld_frame(gEventObjectPic_Man4, 2, 4, 3), + overworld_frame(gEventObjectPic_Man4, 2, 4, 4), + overworld_frame(gEventObjectPic_Man4, 2, 4, 5), + overworld_frame(gEventObjectPic_Man4, 2, 4, 6), + overworld_frame(gEventObjectPic_Man4, 2, 4, 7), + overworld_frame(gEventObjectPic_Man4, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = { - obj_frame_tiles(gEventObjectPic_Woman7_0), - obj_frame_tiles(gEventObjectPic_Woman7_1), - obj_frame_tiles(gEventObjectPic_Woman7_2), - obj_frame_tiles(gEventObjectPic_Woman7_3), - obj_frame_tiles(gEventObjectPic_Woman7_4), - obj_frame_tiles(gEventObjectPic_Woman7_5), - obj_frame_tiles(gEventObjectPic_Woman7_6), - obj_frame_tiles(gEventObjectPic_Woman7_7), - obj_frame_tiles(gEventObjectPic_Woman7_8) + overworld_frame(gEventObjectPic_Woman7, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { - obj_frame_tiles(gEventObjectPic_Youngster_0), - obj_frame_tiles(gEventObjectPic_Youngster_1), - obj_frame_tiles(gEventObjectPic_Youngster_2), - obj_frame_tiles(gEventObjectPic_Youngster_3), - obj_frame_tiles(gEventObjectPic_Youngster_4), - obj_frame_tiles(gEventObjectPic_Youngster_5), - obj_frame_tiles(gEventObjectPic_Youngster_6), - obj_frame_tiles(gEventObjectPic_Youngster_7), - obj_frame_tiles(gEventObjectPic_Youngster_8) + overworld_frame(gEventObjectPic_Youngster, 2, 4, 0), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 1), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 2), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 3), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 4), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 5), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 6), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 7), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = { - obj_frame_tiles(gEventObjectPic_BugCatcher_0), - obj_frame_tiles(gEventObjectPic_BugCatcher_1), - obj_frame_tiles(gEventObjectPic_BugCatcher_2), - obj_frame_tiles(gEventObjectPic_BugCatcher_3), - obj_frame_tiles(gEventObjectPic_BugCatcher_4), - obj_frame_tiles(gEventObjectPic_BugCatcher_5), - obj_frame_tiles(gEventObjectPic_BugCatcher_6), - obj_frame_tiles(gEventObjectPic_BugCatcher_7), - obj_frame_tiles(gEventObjectPic_BugCatcher_8) + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 0), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 1), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 2), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 3), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 4), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 5), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 6), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 7), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = { - obj_frame_tiles(gEventObjectPic_PsychicM_0), - obj_frame_tiles(gEventObjectPic_PsychicM_1), - obj_frame_tiles(gEventObjectPic_PsychicM_2), - obj_frame_tiles(gEventObjectPic_PsychicM_3), - obj_frame_tiles(gEventObjectPic_PsychicM_4), - obj_frame_tiles(gEventObjectPic_PsychicM_5), - obj_frame_tiles(gEventObjectPic_PsychicM_6), - obj_frame_tiles(gEventObjectPic_PsychicM_7), - obj_frame_tiles(gEventObjectPic_PsychicM_8) + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 0), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 1), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 2), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 3), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 4), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 5), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 6), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 7), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = { - obj_frame_tiles(gEventObjectPic_SchoolKidM_0), - obj_frame_tiles(gEventObjectPic_SchoolKidM_1), - obj_frame_tiles(gEventObjectPic_SchoolKidM_2), - obj_frame_tiles(gEventObjectPic_SchoolKidM_3), - obj_frame_tiles(gEventObjectPic_SchoolKidM_4), - obj_frame_tiles(gEventObjectPic_SchoolKidM_5), - obj_frame_tiles(gEventObjectPic_SchoolKidM_6), - obj_frame_tiles(gEventObjectPic_SchoolKidM_7), - obj_frame_tiles(gEventObjectPic_SchoolKidM_8) + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 0), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 1), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 2), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 3), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 4), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 5), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 6), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 7), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = { - obj_frame_tiles(gEventObjectPic_Maniac_0), - obj_frame_tiles(gEventObjectPic_Maniac_1), - obj_frame_tiles(gEventObjectPic_Maniac_2), - obj_frame_tiles(gEventObjectPic_Maniac_3), - obj_frame_tiles(gEventObjectPic_Maniac_4), - obj_frame_tiles(gEventObjectPic_Maniac_5), - obj_frame_tiles(gEventObjectPic_Maniac_6), - obj_frame_tiles(gEventObjectPic_Maniac_7), - obj_frame_tiles(gEventObjectPic_Maniac_8) + overworld_frame(gEventObjectPic_Maniac, 2, 4, 0), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 1), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 2), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 3), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 4), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 5), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 6), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 7), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = { - obj_frame_tiles(gEventObjectPic_HexManiac_0), - obj_frame_tiles(gEventObjectPic_HexManiac_1), - obj_frame_tiles(gEventObjectPic_HexManiac_2), - obj_frame_tiles(gEventObjectPic_HexManiac_3), - obj_frame_tiles(gEventObjectPic_HexManiac_4), - obj_frame_tiles(gEventObjectPic_HexManiac_5), - obj_frame_tiles(gEventObjectPic_HexManiac_6), - obj_frame_tiles(gEventObjectPic_HexManiac_7), - obj_frame_tiles(gEventObjectPic_HexManiac_8) + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 0), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 1), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 2), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 3), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 4), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 5), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 6), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 7), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Woman8[] = { - obj_frame_tiles(gEventObjectPic_Woman8_0), - obj_frame_tiles(gEventObjectPic_Woman8_1), - obj_frame_tiles(gEventObjectPic_Woman8_2), - obj_frame_tiles(gEventObjectPic_Woman8_3), - obj_frame_tiles(gEventObjectPic_Woman8_4), - obj_frame_tiles(gEventObjectPic_Woman8_5), - obj_frame_tiles(gEventObjectPic_Woman8_6), - obj_frame_tiles(gEventObjectPic_Woman8_7), - obj_frame_tiles(gEventObjectPic_Woman8_8) + overworld_frame(gEventObjectPic_Woman8, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman8, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = { - obj_frame_tiles(gEventObjectPic_SwimmerM_0), - obj_frame_tiles(gEventObjectPic_SwimmerM_1), - obj_frame_tiles(gEventObjectPic_SwimmerM_2), - obj_frame_tiles(gEventObjectPic_SwimmerM_3), - obj_frame_tiles(gEventObjectPic_SwimmerM_4), - obj_frame_tiles(gEventObjectPic_SwimmerM_5), - obj_frame_tiles(gEventObjectPic_SwimmerM_6), - obj_frame_tiles(gEventObjectPic_SwimmerM_7), - obj_frame_tiles(gEventObjectPic_SwimmerM_8) + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 0), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 1), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 2), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 3), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 4), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 5), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 6), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 7), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = { - obj_frame_tiles(gEventObjectPic_SwimmerF_0), - obj_frame_tiles(gEventObjectPic_SwimmerF_1), - obj_frame_tiles(gEventObjectPic_SwimmerF_2), - obj_frame_tiles(gEventObjectPic_SwimmerF_3), - obj_frame_tiles(gEventObjectPic_SwimmerF_4), - obj_frame_tiles(gEventObjectPic_SwimmerF_5), - obj_frame_tiles(gEventObjectPic_SwimmerF_6), - obj_frame_tiles(gEventObjectPic_SwimmerF_7), - obj_frame_tiles(gEventObjectPic_SwimmerF_8) + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 0), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 1), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 2), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 3), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 4), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 5), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 6), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 7), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = { - obj_frame_tiles(gEventObjectPic_BlackBelt_0), - obj_frame_tiles(gEventObjectPic_BlackBelt_1), - obj_frame_tiles(gEventObjectPic_BlackBelt_2), - obj_frame_tiles(gEventObjectPic_BlackBelt_3), - obj_frame_tiles(gEventObjectPic_BlackBelt_4), - obj_frame_tiles(gEventObjectPic_BlackBelt_5), - obj_frame_tiles(gEventObjectPic_BlackBelt_6), - obj_frame_tiles(gEventObjectPic_BlackBelt_7), - obj_frame_tiles(gEventObjectPic_BlackBelt_8) + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 0), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 1), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 2), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 3), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 4), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 5), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 6), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 7), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = { - obj_frame_tiles(gEventObjectPic_Beauty_0), - obj_frame_tiles(gEventObjectPic_Beauty_1), - obj_frame_tiles(gEventObjectPic_Beauty_2), - obj_frame_tiles(gEventObjectPic_Beauty_3), - obj_frame_tiles(gEventObjectPic_Beauty_4), - obj_frame_tiles(gEventObjectPic_Beauty_5), - obj_frame_tiles(gEventObjectPic_Beauty_6), - obj_frame_tiles(gEventObjectPic_Beauty_7), - obj_frame_tiles(gEventObjectPic_Beauty_8) + overworld_frame(gEventObjectPic_Beauty, 2, 4, 0), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 1), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 2), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 3), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 4), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 5), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 6), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 7), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = { - obj_frame_tiles(gEventObjectPic_Scientist1_0), - obj_frame_tiles(gEventObjectPic_Scientist1_1), - obj_frame_tiles(gEventObjectPic_Scientist1_2), - obj_frame_tiles(gEventObjectPic_Scientist1_3), - obj_frame_tiles(gEventObjectPic_Scientist1_4), - obj_frame_tiles(gEventObjectPic_Scientist1_5), - obj_frame_tiles(gEventObjectPic_Scientist1_6), - obj_frame_tiles(gEventObjectPic_Scientist1_7), - obj_frame_tiles(gEventObjectPic_Scientist1_8) + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 0), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 1), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 2), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 3), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 4), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 5), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 6), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 7), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Lass[] = { - obj_frame_tiles(gEventObjectPic_Lass_0), - obj_frame_tiles(gEventObjectPic_Lass_1), - obj_frame_tiles(gEventObjectPic_Lass_2), - obj_frame_tiles(gEventObjectPic_Lass_3), - obj_frame_tiles(gEventObjectPic_Lass_4), - obj_frame_tiles(gEventObjectPic_Lass_5), - obj_frame_tiles(gEventObjectPic_Lass_6), - obj_frame_tiles(gEventObjectPic_Lass_7), - obj_frame_tiles(gEventObjectPic_Lass_8) + overworld_frame(gEventObjectPic_Lass, 2, 4, 0), + overworld_frame(gEventObjectPic_Lass, 2, 4, 1), + overworld_frame(gEventObjectPic_Lass, 2, 4, 2), + overworld_frame(gEventObjectPic_Lass, 2, 4, 3), + overworld_frame(gEventObjectPic_Lass, 2, 4, 4), + overworld_frame(gEventObjectPic_Lass, 2, 4, 5), + overworld_frame(gEventObjectPic_Lass, 2, 4, 6), + overworld_frame(gEventObjectPic_Lass, 2, 4, 7), + overworld_frame(gEventObjectPic_Lass, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = { - obj_frame_tiles(gEventObjectPic_Gentleman_0), - obj_frame_tiles(gEventObjectPic_Gentleman_1), - obj_frame_tiles(gEventObjectPic_Gentleman_2), - obj_frame_tiles(gEventObjectPic_Gentleman_3), - obj_frame_tiles(gEventObjectPic_Gentleman_4), - obj_frame_tiles(gEventObjectPic_Gentleman_5), - obj_frame_tiles(gEventObjectPic_Gentleman_6), - obj_frame_tiles(gEventObjectPic_Gentleman_7), - obj_frame_tiles(gEventObjectPic_Gentleman_8) + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 0), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 1), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 2), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 3), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 4), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 5), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 6), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 7), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = { - obj_frame_tiles(gEventObjectPic_Sailor_0), - obj_frame_tiles(gEventObjectPic_Sailor_1), - obj_frame_tiles(gEventObjectPic_Sailor_2), - obj_frame_tiles(gEventObjectPic_Sailor_3), - obj_frame_tiles(gEventObjectPic_Sailor_4), - obj_frame_tiles(gEventObjectPic_Sailor_5), - obj_frame_tiles(gEventObjectPic_Sailor_6), - obj_frame_tiles(gEventObjectPic_Sailor_7), - obj_frame_tiles(gEventObjectPic_Sailor_8) + overworld_frame(gEventObjectPic_Sailor, 2, 4, 0), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 1), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 2), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 3), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 4), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 5), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 6), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 7), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = { - obj_frame_tiles(gEventObjectPic_Fisherman_0), - obj_frame_tiles(gEventObjectPic_Fisherman_1), - obj_frame_tiles(gEventObjectPic_Fisherman_2), - obj_frame_tiles(gEventObjectPic_Fisherman_3), - obj_frame_tiles(gEventObjectPic_Fisherman_4), - obj_frame_tiles(gEventObjectPic_Fisherman_5), - obj_frame_tiles(gEventObjectPic_Fisherman_6), - obj_frame_tiles(gEventObjectPic_Fisherman_7), - obj_frame_tiles(gEventObjectPic_Fisherman_8) + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 0), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 1), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 2), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 3), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 4), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 5), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 6), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 7), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = { - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_0), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_1), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_2), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_3), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_4), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_5), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_6), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_7), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_8) + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 0), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 1), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 2), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 3), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 4), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 5), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 6), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 7), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = { - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_0), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_1), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_2), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_3), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_4), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_5), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_6), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_7), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_8) + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 0), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 1), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 2), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 3), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 4), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 5), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 6), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 7), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = { - obj_frame_tiles(gEventObjectPic_TuberF_0), - obj_frame_tiles(gEventObjectPic_TuberF_1), - obj_frame_tiles(gEventObjectPic_TuberF_2), - obj_frame_tiles(gEventObjectPic_TuberF_3), - obj_frame_tiles(gEventObjectPic_TuberF_4), - obj_frame_tiles(gEventObjectPic_TuberF_5), - obj_frame_tiles(gEventObjectPic_TuberF_6), - obj_frame_tiles(gEventObjectPic_TuberF_7), - obj_frame_tiles(gEventObjectPic_TuberF_8) + overworld_frame(gEventObjectPic_TuberF, 2, 2, 0), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 1), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 2), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 3), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 4), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 5), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 6), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 7), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = { - obj_frame_tiles(gEventObjectPic_TuberM_0), - obj_frame_tiles(gEventObjectPic_TuberM_1), - obj_frame_tiles(gEventObjectPic_TuberM_2), - obj_frame_tiles(gEventObjectPic_TuberM_3), - obj_frame_tiles(gEventObjectPic_TuberM_4), - obj_frame_tiles(gEventObjectPic_TuberM_5), - obj_frame_tiles(gEventObjectPic_TuberM_6), - obj_frame_tiles(gEventObjectPic_TuberM_7), - obj_frame_tiles(gEventObjectPic_TuberM_8) + overworld_frame(gEventObjectPic_TuberM, 2, 2, 0), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 1), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 2), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 3), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 4), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 5), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 6), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 7), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = { - obj_frame_tiles(gEventObjectPic_Hiker_0), - obj_frame_tiles(gEventObjectPic_Hiker_1), - obj_frame_tiles(gEventObjectPic_Hiker_2), - obj_frame_tiles(gEventObjectPic_Hiker_3), - obj_frame_tiles(gEventObjectPic_Hiker_4), - obj_frame_tiles(gEventObjectPic_Hiker_5), - obj_frame_tiles(gEventObjectPic_Hiker_6), - obj_frame_tiles(gEventObjectPic_Hiker_7), - obj_frame_tiles(gEventObjectPic_Hiker_8) + overworld_frame(gEventObjectPic_Hiker, 2, 4, 0), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 1), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 2), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 3), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 4), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 5), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 6), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 7), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = { - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_0), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_1), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_2), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_3), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_4), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_5), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_6), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_7), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_8) + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 0), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 1), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 2), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 3), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 4), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 5), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 6), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 7), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = { - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_0), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_1), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_2), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_3), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_4), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_5), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_6), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_7), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_8) + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 0), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 1), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 2), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 3), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 4), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 5), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 6), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 7), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = { - obj_frame_tiles(gEventObjectPic_Nurse_0), - obj_frame_tiles(gEventObjectPic_Nurse_1), - obj_frame_tiles(gEventObjectPic_Nurse_2), - obj_frame_tiles(gEventObjectPic_Nurse_3), - obj_frame_tiles(gEventObjectPic_Nurse_4), - obj_frame_tiles(gEventObjectPic_Nurse_5), - obj_frame_tiles(gEventObjectPic_Nurse_6), - obj_frame_tiles(gEventObjectPic_Nurse_7), - obj_frame_tiles(gEventObjectPic_Nurse_8), - obj_frame_tiles(gEventObjectPic_Nurse_9) + overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 3), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 4), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 5), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 6), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 7), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 8), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 9) }; const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { - obj_frame_tiles(gEventObjectPic_ItemBall) + overworld_frame(gEventObjectPic_ItemBall, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { - obj_frame_tiles(gEventObjectPic_ProfBirch_0), - obj_frame_tiles(gEventObjectPic_ProfBirch_1), - obj_frame_tiles(gEventObjectPic_ProfBirch_2), - obj_frame_tiles(gEventObjectPic_ProfBirch_3), - obj_frame_tiles(gEventObjectPic_ProfBirch_4), - obj_frame_tiles(gEventObjectPic_ProfBirch_5), - obj_frame_tiles(gEventObjectPic_ProfBirch_6), - obj_frame_tiles(gEventObjectPic_ProfBirch_7), - obj_frame_tiles(gEventObjectPic_ProfBirch_8) + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 0), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 1), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 2), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 3), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 4), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 5), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 6), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 7), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { - obj_frame_tiles(gEventObjectPic_Man5_0), - obj_frame_tiles(gEventObjectPic_Man5_1), - obj_frame_tiles(gEventObjectPic_Man5_2), - obj_frame_tiles(gEventObjectPic_Man5_3), - obj_frame_tiles(gEventObjectPic_Man5_4), - obj_frame_tiles(gEventObjectPic_Man5_5), - obj_frame_tiles(gEventObjectPic_Man5_6), - obj_frame_tiles(gEventObjectPic_Man5_7), - obj_frame_tiles(gEventObjectPic_Man5_8) + overworld_frame(gEventObjectPic_Man5, 2, 4, 0), + overworld_frame(gEventObjectPic_Man5, 2, 4, 1), + overworld_frame(gEventObjectPic_Man5, 2, 4, 2), + overworld_frame(gEventObjectPic_Man5, 2, 4, 3), + overworld_frame(gEventObjectPic_Man5, 2, 4, 4), + overworld_frame(gEventObjectPic_Man5, 2, 4, 5), + overworld_frame(gEventObjectPic_Man5, 2, 4, 6), + overworld_frame(gEventObjectPic_Man5, 2, 4, 7), + overworld_frame(gEventObjectPic_Man5, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man6[] = { - obj_frame_tiles(gEventObjectPic_Man6_0), - obj_frame_tiles(gEventObjectPic_Man6_1), - obj_frame_tiles(gEventObjectPic_Man6_2), - obj_frame_tiles(gEventObjectPic_Man6_3), - obj_frame_tiles(gEventObjectPic_Man6_4), - obj_frame_tiles(gEventObjectPic_Man6_5), - obj_frame_tiles(gEventObjectPic_Man6_6), - obj_frame_tiles(gEventObjectPic_Man6_7), - obj_frame_tiles(gEventObjectPic_Man6_8) + overworld_frame(gEventObjectPic_Man6, 2, 4, 0), + overworld_frame(gEventObjectPic_Man6, 2, 4, 1), + overworld_frame(gEventObjectPic_Man6, 2, 4, 2), + overworld_frame(gEventObjectPic_Man6, 2, 4, 3), + overworld_frame(gEventObjectPic_Man6, 2, 4, 4), + overworld_frame(gEventObjectPic_Man6, 2, 4, 5), + overworld_frame(gEventObjectPic_Man6, 2, 4, 6), + overworld_frame(gEventObjectPic_Man6, 2, 4, 7), + overworld_frame(gEventObjectPic_Man6, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { - obj_frame_tiles(gEventObjectPic_ReporterM_0), - obj_frame_tiles(gEventObjectPic_ReporterM_1), - obj_frame_tiles(gEventObjectPic_ReporterM_2), - obj_frame_tiles(gEventObjectPic_ReporterM_3), - obj_frame_tiles(gEventObjectPic_ReporterM_4), - obj_frame_tiles(gEventObjectPic_ReporterM_5), - obj_frame_tiles(gEventObjectPic_ReporterM_6), - obj_frame_tiles(gEventObjectPic_ReporterM_7), - obj_frame_tiles(gEventObjectPic_ReporterM_8) + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 0), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 1), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 2), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 3), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 4), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 5), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 6), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 7), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = { - obj_frame_tiles(gEventObjectPic_ReporterF_0), - obj_frame_tiles(gEventObjectPic_ReporterF_1), - obj_frame_tiles(gEventObjectPic_ReporterF_2), - obj_frame_tiles(gEventObjectPic_ReporterF_3), - obj_frame_tiles(gEventObjectPic_ReporterF_4), - obj_frame_tiles(gEventObjectPic_ReporterF_5), - obj_frame_tiles(gEventObjectPic_ReporterF_6), - obj_frame_tiles(gEventObjectPic_ReporterF_7), - obj_frame_tiles(gEventObjectPic_ReporterF_8) + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 0), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 1), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 2), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 3), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 4), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 5), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 6), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 7), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = { - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_0), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_1), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_2), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_3), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_4), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_5), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_6), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_7), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_8) + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 0), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 1), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 2), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 3), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 4), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 5), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 6), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 7), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = { - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_0), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_1), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_2), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_3), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_4), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_5), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_6), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_7), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_8) + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 2), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 3), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 4), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 5), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 6), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 7), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedNatuDoll) + overworld_frame(gEventObjectPic_UnusedNatuDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedMagnemiteDoll) + overworld_frame(gEventObjectPic_UnusedMagnemiteDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedSquirtleDoll) + overworld_frame(gEventObjectPic_UnusedSquirtleDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedWooperDoll) + overworld_frame(gEventObjectPic_UnusedWooperDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPikachuDoll) + overworld_frame(gEventObjectPic_UnusedPikachuDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPorygon2Doll) + overworld_frame(gEventObjectPic_UnusedPorygon2Doll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = { - obj_frame_tiles(gEventObjectPic_CuttableTree_0), - obj_frame_tiles(gEventObjectPic_CuttableTree_1), - obj_frame_tiles(gEventObjectPic_CuttableTree_2), - obj_frame_tiles(gEventObjectPic_CuttableTree_3) + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 0), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 1), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 2), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 3) }; const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = { - obj_frame_tiles(gEventObjectPic_MartEmployee_0), - obj_frame_tiles(gEventObjectPic_MartEmployee_1), - obj_frame_tiles(gEventObjectPic_MartEmployee_2), - obj_frame_tiles(gEventObjectPic_MartEmployee_3), - obj_frame_tiles(gEventObjectPic_MartEmployee_4), - obj_frame_tiles(gEventObjectPic_MartEmployee_5), - obj_frame_tiles(gEventObjectPic_MartEmployee_6), - obj_frame_tiles(gEventObjectPic_MartEmployee_7), - obj_frame_tiles(gEventObjectPic_MartEmployee_8) + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 0), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 1), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 2), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 3), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 4), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 5), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 6), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 7), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = { - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_0), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_1), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_2), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_3), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_4), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_5), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_6), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_7), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_8) + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 0), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 1), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 2), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 3), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 4), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 5), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 6), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 7), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Teala[] = { - obj_frame_tiles(gEventObjectPic_Teala_0), - obj_frame_tiles(gEventObjectPic_Teala_1), - obj_frame_tiles(gEventObjectPic_Teala_2), - obj_frame_tiles(gEventObjectPic_Teala_3), - obj_frame_tiles(gEventObjectPic_Teala_4), - obj_frame_tiles(gEventObjectPic_Teala_5), - obj_frame_tiles(gEventObjectPic_Teala_6), - obj_frame_tiles(gEventObjectPic_Teala_7), - obj_frame_tiles(gEventObjectPic_Teala_8) + overworld_frame(gEventObjectPic_Teala, 2, 4, 0), + overworld_frame(gEventObjectPic_Teala, 2, 4, 1), + overworld_frame(gEventObjectPic_Teala, 2, 4, 2), + overworld_frame(gEventObjectPic_Teala, 2, 4, 3), + overworld_frame(gEventObjectPic_Teala, 2, 4, 4), + overworld_frame(gEventObjectPic_Teala, 2, 4, 5), + overworld_frame(gEventObjectPic_Teala, 2, 4, 6), + overworld_frame(gEventObjectPic_Teala, 2, 4, 7), + overworld_frame(gEventObjectPic_Teala, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = { - obj_frame_tiles(gEventObjectPic_BreakableRock_0), - obj_frame_tiles(gEventObjectPic_BreakableRock_1), - obj_frame_tiles(gEventObjectPic_BreakableRock_2), - obj_frame_tiles(gEventObjectPic_BreakableRock_3) + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 0), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 1), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 2), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 3) }; const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { - obj_frame_tiles(gEventObjectPic_PushableBoulder) + overworld_frame(gEventObjectPic_PushableBoulder, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = { - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2) + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { - obj_frame_tiles(gEventObjectPic_Truck) + overworld_frame(gEventObjectPic_Truck, 6, 6, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MachokeCarryingBox[] = { - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_0), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_0), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_0), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_1), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_2), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_1), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_2), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_1), - obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_2) + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_MachokeFacingAway[] = { - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_0), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_0), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_0), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1), - obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1) + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1) }; const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { - obj_frame_tiles(gEventObjectPic_BirchsBag) + overworld_frame(gEventObjectPic_BirchsBag, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = { - obj_frame_tiles(gEventObjectPic_Poochyena_0), - obj_frame_tiles(gEventObjectPic_Poochyena_1), - obj_frame_tiles(gEventObjectPic_Poochyena_2), - obj_frame_tiles(gEventObjectPic_Poochyena_3), - obj_frame_tiles(gEventObjectPic_Poochyena_4), - obj_frame_tiles(gEventObjectPic_Poochyena_5), - obj_frame_tiles(gEventObjectPic_Poochyena_6), - obj_frame_tiles(gEventObjectPic_Poochyena_7), - obj_frame_tiles(gEventObjectPic_Poochyena_8) + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 0), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 1), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 2), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 3), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 4), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 5), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 6), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 7), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Artist[] = { - obj_frame_tiles(gEventObjectPic_Artist_0), - obj_frame_tiles(gEventObjectPic_Artist_1), - obj_frame_tiles(gEventObjectPic_Artist_2), - obj_frame_tiles(gEventObjectPic_Artist_3), - obj_frame_tiles(gEventObjectPic_Artist_4), - obj_frame_tiles(gEventObjectPic_Artist_5), - obj_frame_tiles(gEventObjectPic_Artist_6), - obj_frame_tiles(gEventObjectPic_Artist_7), - obj_frame_tiles(gEventObjectPic_Artist_8) + overworld_frame(gEventObjectPic_Artist, 2, 4, 0), + overworld_frame(gEventObjectPic_Artist, 2, 4, 1), + overworld_frame(gEventObjectPic_Artist, 2, 4, 2), + overworld_frame(gEventObjectPic_Artist, 2, 4, 3), + overworld_frame(gEventObjectPic_Artist, 2, 4, 4), + overworld_frame(gEventObjectPic_Artist, 2, 4, 5), + overworld_frame(gEventObjectPic_Artist, 2, 4, 6), + overworld_frame(gEventObjectPic_Artist, 2, 4, 7), + overworld_frame(gEventObjectPic_Artist, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = { - obj_frame_tiles(gEventObjectPic_MayNormal_0), - obj_frame_tiles(gEventObjectPic_MayNormal_1), - obj_frame_tiles(gEventObjectPic_MayNormal_2), - obj_frame_tiles(gEventObjectPic_MayNormal_3), - obj_frame_tiles(gEventObjectPic_MayNormal_4), - obj_frame_tiles(gEventObjectPic_MayNormal_5), - obj_frame_tiles(gEventObjectPic_MayNormal_6), - obj_frame_tiles(gEventObjectPic_MayNormal_7), - obj_frame_tiles(gEventObjectPic_MayNormal_8), - obj_frame_tiles(gEventObjectPic_MayNormal_9), - obj_frame_tiles(gEventObjectPic_MayNormal_10), - obj_frame_tiles(gEventObjectPic_MayNormal_11), - obj_frame_tiles(gEventObjectPic_MayNormal_12), - obj_frame_tiles(gEventObjectPic_MayNormal_13), - obj_frame_tiles(gEventObjectPic_MayNormal_14), - obj_frame_tiles(gEventObjectPic_MayNormal_15), - obj_frame_tiles(gEventObjectPic_MayNormal_16), - obj_frame_tiles(gEventObjectPic_MayNormal_17) + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 0), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 1), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 2), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 3), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 4), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 5), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 6), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 7), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 8), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 9), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 10), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 11), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 12), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 13), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 14), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 15), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 16), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 17) }; const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = { - obj_frame_tiles(gEventObjectPic_MayMachBike_0), - obj_frame_tiles(gEventObjectPic_MayMachBike_1), - obj_frame_tiles(gEventObjectPic_MayMachBike_2), - obj_frame_tiles(gEventObjectPic_MayMachBike_3), - obj_frame_tiles(gEventObjectPic_MayMachBike_4), - obj_frame_tiles(gEventObjectPic_MayMachBike_5), - obj_frame_tiles(gEventObjectPic_MayMachBike_6), - obj_frame_tiles(gEventObjectPic_MayMachBike_7), - obj_frame_tiles(gEventObjectPic_MayMachBike_8) + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 0), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 1), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 2), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 3), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 4), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 5), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 6), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 7), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = { - obj_frame_tiles(gEventObjectPic_MayAcroBike_0), - obj_frame_tiles(gEventObjectPic_MayAcroBike_1), - obj_frame_tiles(gEventObjectPic_MayAcroBike_2), - obj_frame_tiles(gEventObjectPic_MayAcroBike_3), - obj_frame_tiles(gEventObjectPic_MayAcroBike_4), - obj_frame_tiles(gEventObjectPic_MayAcroBike_5), - obj_frame_tiles(gEventObjectPic_MayAcroBike_6), - obj_frame_tiles(gEventObjectPic_MayAcroBike_7), - obj_frame_tiles(gEventObjectPic_MayAcroBike_8), - obj_frame_tiles(gEventObjectPic_MayAcroBike_9), - obj_frame_tiles(gEventObjectPic_MayAcroBike_10), - obj_frame_tiles(gEventObjectPic_MayAcroBike_11), - obj_frame_tiles(gEventObjectPic_MayAcroBike_12), - obj_frame_tiles(gEventObjectPic_MayAcroBike_13), - obj_frame_tiles(gEventObjectPic_MayAcroBike_14), - obj_frame_tiles(gEventObjectPic_MayAcroBike_15), - obj_frame_tiles(gEventObjectPic_MayAcroBike_16), - obj_frame_tiles(gEventObjectPic_MayAcroBike_17), - obj_frame_tiles(gEventObjectPic_MayAcroBike_18), - obj_frame_tiles(gEventObjectPic_MayAcroBike_19), - obj_frame_tiles(gEventObjectPic_MayAcroBike_20), - obj_frame_tiles(gEventObjectPic_MayAcroBike_21), - obj_frame_tiles(gEventObjectPic_MayAcroBike_22), - obj_frame_tiles(gEventObjectPic_MayAcroBike_23), - obj_frame_tiles(gEventObjectPic_MayAcroBike_24), - obj_frame_tiles(gEventObjectPic_MayAcroBike_25), - obj_frame_tiles(gEventObjectPic_MayAcroBike_26) + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 0), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 1), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 2), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 3), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 4), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 5), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 6), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 7), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 8), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 9), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 10), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 11), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 12), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 13), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 14), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 15), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 16), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 17), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 18), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 19), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 20), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 21), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 22), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 23), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 24), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 25), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 26) }; const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = { - obj_frame_tiles(gEventObjectPic_MaySurfing_0), - obj_frame_tiles(gEventObjectPic_MaySurfing_1), - obj_frame_tiles(gEventObjectPic_MaySurfing_2), - obj_frame_tiles(gEventObjectPic_MaySurfing_0), - obj_frame_tiles(gEventObjectPic_MaySurfing_0), - obj_frame_tiles(gEventObjectPic_MaySurfing_1), - obj_frame_tiles(gEventObjectPic_MaySurfing_1), - obj_frame_tiles(gEventObjectPic_MaySurfing_2), - obj_frame_tiles(gEventObjectPic_MaySurfing_2), - obj_frame_tiles(gEventObjectPic_MaySurfing_3), - obj_frame_tiles(gEventObjectPic_MaySurfing_4), - obj_frame_tiles(gEventObjectPic_MaySurfing_5) + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 1), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 3), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 5) }; const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = { - obj_frame_tiles(gEventObjectPic_MayUnderwater_0), - obj_frame_tiles(gEventObjectPic_MayUnderwater_1), - obj_frame_tiles(gEventObjectPic_MayUnderwater_2), - obj_frame_tiles(gEventObjectPic_MayUnderwater_0), - obj_frame_tiles(gEventObjectPic_MayUnderwater_0), - obj_frame_tiles(gEventObjectPic_MayUnderwater_1), - obj_frame_tiles(gEventObjectPic_MayUnderwater_1), - obj_frame_tiles(gEventObjectPic_MayUnderwater_2), - obj_frame_tiles(gEventObjectPic_MayUnderwater_2) + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = { - obj_frame_tiles(gEventObjectPic_MayFieldMove_0), - obj_frame_tiles(gEventObjectPic_MayFieldMove_1), - obj_frame_tiles(gEventObjectPic_MayFieldMove_2), - obj_frame_tiles(gEventObjectPic_MayFieldMove_3), - obj_frame_tiles(gEventObjectPic_MayFieldMove_4) + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 0), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 1), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 2), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 3), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 4) }; const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = { - obj_frame_tiles(gEventObjectPic_Cameraman_0), - obj_frame_tiles(gEventObjectPic_Cameraman_1), - obj_frame_tiles(gEventObjectPic_Cameraman_2), - obj_frame_tiles(gEventObjectPic_Cameraman_3), - obj_frame_tiles(gEventObjectPic_Cameraman_4), - obj_frame_tiles(gEventObjectPic_Cameraman_5), - obj_frame_tiles(gEventObjectPic_Cameraman_6), - obj_frame_tiles(gEventObjectPic_Cameraman_7), - obj_frame_tiles(gEventObjectPic_Cameraman_8) + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 0), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 1), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 2), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 3), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 4), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 5), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 6), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 7), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = { - obj_frame_tiles(gEventObjectPic_MovingBox) + overworld_frame(gEventObjectPic_MovingBox, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { - obj_frame_tiles(gEventObjectPic_CableCar) + overworld_frame(gEventObjectPic_CableCar, 8, 8, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { - obj_frame_tiles(gEventObjectPic_Scientist2_0), - obj_frame_tiles(gEventObjectPic_Scientist2_1), - obj_frame_tiles(gEventObjectPic_Scientist2_2), - obj_frame_tiles(gEventObjectPic_Scientist2_3), - obj_frame_tiles(gEventObjectPic_Scientist2_4), - obj_frame_tiles(gEventObjectPic_Scientist2_5), - obj_frame_tiles(gEventObjectPic_Scientist2_6), - obj_frame_tiles(gEventObjectPic_Scientist2_7), - obj_frame_tiles(gEventObjectPic_Scientist2_8) + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 0), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 1), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 2), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 3), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 4), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 5), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 6), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 7), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Man7[] = { - obj_frame_tiles(gEventObjectPic_Man7_0), - obj_frame_tiles(gEventObjectPic_Man7_1), - obj_frame_tiles(gEventObjectPic_Man7_2), - obj_frame_tiles(gEventObjectPic_Man7_3), - obj_frame_tiles(gEventObjectPic_Man7_4), - obj_frame_tiles(gEventObjectPic_Man7_5), - obj_frame_tiles(gEventObjectPic_Man7_6), - obj_frame_tiles(gEventObjectPic_Man7_7), - obj_frame_tiles(gEventObjectPic_Man7_8) + overworld_frame(gEventObjectPic_Man7, 2, 4, 0), + overworld_frame(gEventObjectPic_Man7, 2, 4, 1), + overworld_frame(gEventObjectPic_Man7, 2, 4, 2), + overworld_frame(gEventObjectPic_Man7, 2, 4, 3), + overworld_frame(gEventObjectPic_Man7, 2, 4, 4), + overworld_frame(gEventObjectPic_Man7, 2, 4, 5), + overworld_frame(gEventObjectPic_Man7, 2, 4, 6), + overworld_frame(gEventObjectPic_Man7, 2, 4, 7), + overworld_frame(gEventObjectPic_Man7, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { - obj_frame_tiles(gEventObjectPic_AquaMemberM_0), - obj_frame_tiles(gEventObjectPic_AquaMemberM_1), - obj_frame_tiles(gEventObjectPic_AquaMemberM_2), - obj_frame_tiles(gEventObjectPic_AquaMemberM_3), - obj_frame_tiles(gEventObjectPic_AquaMemberM_4), - obj_frame_tiles(gEventObjectPic_AquaMemberM_5), - obj_frame_tiles(gEventObjectPic_AquaMemberM_6), - obj_frame_tiles(gEventObjectPic_AquaMemberM_7), - obj_frame_tiles(gEventObjectPic_AquaMemberM_8) + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 0), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 1), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 2), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 3), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 4), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 5), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 6), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 7), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = { - obj_frame_tiles(gEventObjectPic_AquaMemberF_0), - obj_frame_tiles(gEventObjectPic_AquaMemberF_1), - obj_frame_tiles(gEventObjectPic_AquaMemberF_2), - obj_frame_tiles(gEventObjectPic_AquaMemberF_3), - obj_frame_tiles(gEventObjectPic_AquaMemberF_4), - obj_frame_tiles(gEventObjectPic_AquaMemberF_5), - obj_frame_tiles(gEventObjectPic_AquaMemberF_6), - obj_frame_tiles(gEventObjectPic_AquaMemberF_7), - obj_frame_tiles(gEventObjectPic_AquaMemberF_8) + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 0), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 1), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 2), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 3), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 4), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 5), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 6), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 7), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = { - obj_frame_tiles(gEventObjectPic_MagmaMemberM_0), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_1), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_2), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_3), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_4), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_5), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_6), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_7), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_8) + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 0), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 1), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 2), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 3), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 4), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 5), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 6), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 7), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = { - obj_frame_tiles(gEventObjectPic_MagmaMemberF_0), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_1), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_2), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_3), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_4), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_5), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_6), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_7), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_8) + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 0), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 1), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 2), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 3), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 4), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 5), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 6), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 7), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = { - obj_frame_tiles(gEventObjectPic_Sidney_0), - obj_frame_tiles(gEventObjectPic_Sidney_1), - obj_frame_tiles(gEventObjectPic_Sidney_2), - obj_frame_tiles(gEventObjectPic_Sidney_0), - obj_frame_tiles(gEventObjectPic_Sidney_0), - obj_frame_tiles(gEventObjectPic_Sidney_1), - obj_frame_tiles(gEventObjectPic_Sidney_1), - obj_frame_tiles(gEventObjectPic_Sidney_2), - obj_frame_tiles(gEventObjectPic_Sidney_2) + overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = { - obj_frame_tiles(gEventObjectPic_Phoebe_0), - obj_frame_tiles(gEventObjectPic_Phoebe_1), - obj_frame_tiles(gEventObjectPic_Phoebe_2), - obj_frame_tiles(gEventObjectPic_Phoebe_0), - obj_frame_tiles(gEventObjectPic_Phoebe_0), - obj_frame_tiles(gEventObjectPic_Phoebe_1), - obj_frame_tiles(gEventObjectPic_Phoebe_1), - obj_frame_tiles(gEventObjectPic_Phoebe_2), - obj_frame_tiles(gEventObjectPic_Phoebe_2) + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = { - obj_frame_tiles(gEventObjectPic_Glacia_0), - obj_frame_tiles(gEventObjectPic_Glacia_1), - obj_frame_tiles(gEventObjectPic_Glacia_2), - obj_frame_tiles(gEventObjectPic_Glacia_0), - obj_frame_tiles(gEventObjectPic_Glacia_0), - obj_frame_tiles(gEventObjectPic_Glacia_1), - obj_frame_tiles(gEventObjectPic_Glacia_1), - obj_frame_tiles(gEventObjectPic_Glacia_2), - obj_frame_tiles(gEventObjectPic_Glacia_2) + overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Drake[] = { - obj_frame_tiles(gEventObjectPic_Drake_0), - obj_frame_tiles(gEventObjectPic_Drake_1), - obj_frame_tiles(gEventObjectPic_Drake_2), - obj_frame_tiles(gEventObjectPic_Drake_0), - obj_frame_tiles(gEventObjectPic_Drake_0), - obj_frame_tiles(gEventObjectPic_Drake_1), - obj_frame_tiles(gEventObjectPic_Drake_1), - obj_frame_tiles(gEventObjectPic_Drake_2), - obj_frame_tiles(gEventObjectPic_Drake_2) + overworld_frame(gEventObjectPic_Drake, 2, 4, 0), + overworld_frame(gEventObjectPic_Drake, 2, 4, 1), + overworld_frame(gEventObjectPic_Drake, 2, 4, 2), + overworld_frame(gEventObjectPic_Drake, 2, 4, 0), + overworld_frame(gEventObjectPic_Drake, 2, 4, 0), + overworld_frame(gEventObjectPic_Drake, 2, 4, 1), + overworld_frame(gEventObjectPic_Drake, 2, 4, 1), + overworld_frame(gEventObjectPic_Drake, 2, 4, 2), + overworld_frame(gEventObjectPic_Drake, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = { - obj_frame_tiles(gEventObjectPic_Roxanne_0), - obj_frame_tiles(gEventObjectPic_Roxanne_1), - obj_frame_tiles(gEventObjectPic_Roxanne_2), - obj_frame_tiles(gEventObjectPic_Roxanne_0), - obj_frame_tiles(gEventObjectPic_Roxanne_0), - obj_frame_tiles(gEventObjectPic_Roxanne_1), - obj_frame_tiles(gEventObjectPic_Roxanne_1), - obj_frame_tiles(gEventObjectPic_Roxanne_2), - obj_frame_tiles(gEventObjectPic_Roxanne_2) + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = { - obj_frame_tiles(gEventObjectPic_Brawly_0), - obj_frame_tiles(gEventObjectPic_Brawly_1), - obj_frame_tiles(gEventObjectPic_Brawly_2), - obj_frame_tiles(gEventObjectPic_Brawly_0), - obj_frame_tiles(gEventObjectPic_Brawly_0), - obj_frame_tiles(gEventObjectPic_Brawly_1), - obj_frame_tiles(gEventObjectPic_Brawly_1), - obj_frame_tiles(gEventObjectPic_Brawly_2), - obj_frame_tiles(gEventObjectPic_Brawly_2) + overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = { - obj_frame_tiles(gEventObjectPic_Wattson_0), - obj_frame_tiles(gEventObjectPic_Wattson_1), - obj_frame_tiles(gEventObjectPic_Wattson_2), - obj_frame_tiles(gEventObjectPic_Wattson_0), - obj_frame_tiles(gEventObjectPic_Wattson_0), - obj_frame_tiles(gEventObjectPic_Wattson_1), - obj_frame_tiles(gEventObjectPic_Wattson_1), - obj_frame_tiles(gEventObjectPic_Wattson_2), - obj_frame_tiles(gEventObjectPic_Wattson_2) + overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = { - obj_frame_tiles(gEventObjectPic_Flannery_0), - obj_frame_tiles(gEventObjectPic_Flannery_1), - obj_frame_tiles(gEventObjectPic_Flannery_2), - obj_frame_tiles(gEventObjectPic_Flannery_0), - obj_frame_tiles(gEventObjectPic_Flannery_0), - obj_frame_tiles(gEventObjectPic_Flannery_1), - obj_frame_tiles(gEventObjectPic_Flannery_1), - obj_frame_tiles(gEventObjectPic_Flannery_2), - obj_frame_tiles(gEventObjectPic_Flannery_2) + overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Norman[] = { - obj_frame_tiles(gEventObjectPic_Norman_0), - obj_frame_tiles(gEventObjectPic_Norman_1), - obj_frame_tiles(gEventObjectPic_Norman_2), - obj_frame_tiles(gEventObjectPic_Norman_3), - obj_frame_tiles(gEventObjectPic_Norman_4), - obj_frame_tiles(gEventObjectPic_Norman_5), - obj_frame_tiles(gEventObjectPic_Norman_6), - obj_frame_tiles(gEventObjectPic_Norman_7), - obj_frame_tiles(gEventObjectPic_Norman_8) + overworld_frame(gEventObjectPic_Norman, 2, 4, 0), + overworld_frame(gEventObjectPic_Norman, 2, 4, 1), + overworld_frame(gEventObjectPic_Norman, 2, 4, 2), + overworld_frame(gEventObjectPic_Norman, 2, 4, 3), + overworld_frame(gEventObjectPic_Norman, 2, 4, 4), + overworld_frame(gEventObjectPic_Norman, 2, 4, 5), + overworld_frame(gEventObjectPic_Norman, 2, 4, 6), + overworld_frame(gEventObjectPic_Norman, 2, 4, 7), + overworld_frame(gEventObjectPic_Norman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Winona[] = { - obj_frame_tiles(gEventObjectPic_Winona_0), - obj_frame_tiles(gEventObjectPic_Winona_1), - obj_frame_tiles(gEventObjectPic_Winona_2), - obj_frame_tiles(gEventObjectPic_Winona_0), - obj_frame_tiles(gEventObjectPic_Winona_0), - obj_frame_tiles(gEventObjectPic_Winona_1), - obj_frame_tiles(gEventObjectPic_Winona_1), - obj_frame_tiles(gEventObjectPic_Winona_2), - obj_frame_tiles(gEventObjectPic_Winona_2) + overworld_frame(gEventObjectPic_Winona, 2, 4, 0), + overworld_frame(gEventObjectPic_Winona, 2, 4, 1), + overworld_frame(gEventObjectPic_Winona, 2, 4, 2), + overworld_frame(gEventObjectPic_Winona, 2, 4, 0), + overworld_frame(gEventObjectPic_Winona, 2, 4, 0), + overworld_frame(gEventObjectPic_Winona, 2, 4, 1), + overworld_frame(gEventObjectPic_Winona, 2, 4, 1), + overworld_frame(gEventObjectPic_Winona, 2, 4, 2), + overworld_frame(gEventObjectPic_Winona, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Liza[] = { - obj_frame_tiles(gEventObjectPic_Liza_0), - obj_frame_tiles(gEventObjectPic_Liza_1), - obj_frame_tiles(gEventObjectPic_Liza_2), - obj_frame_tiles(gEventObjectPic_Liza_0), - obj_frame_tiles(gEventObjectPic_Liza_0), - obj_frame_tiles(gEventObjectPic_Liza_1), - obj_frame_tiles(gEventObjectPic_Liza_1), - obj_frame_tiles(gEventObjectPic_Liza_2), - obj_frame_tiles(gEventObjectPic_Liza_2) + overworld_frame(gEventObjectPic_Liza, 2, 4, 0), + overworld_frame(gEventObjectPic_Liza, 2, 4, 1), + overworld_frame(gEventObjectPic_Liza, 2, 4, 2), + overworld_frame(gEventObjectPic_Liza, 2, 4, 0), + overworld_frame(gEventObjectPic_Liza, 2, 4, 0), + overworld_frame(gEventObjectPic_Liza, 2, 4, 1), + overworld_frame(gEventObjectPic_Liza, 2, 4, 1), + overworld_frame(gEventObjectPic_Liza, 2, 4, 2), + overworld_frame(gEventObjectPic_Liza, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Tate[] = { - obj_frame_tiles(gEventObjectPic_Tate_0), - obj_frame_tiles(gEventObjectPic_Tate_1), - obj_frame_tiles(gEventObjectPic_Tate_2), - obj_frame_tiles(gEventObjectPic_Tate_0), - obj_frame_tiles(gEventObjectPic_Tate_0), - obj_frame_tiles(gEventObjectPic_Tate_1), - obj_frame_tiles(gEventObjectPic_Tate_1), - obj_frame_tiles(gEventObjectPic_Tate_2), - obj_frame_tiles(gEventObjectPic_Tate_2) + overworld_frame(gEventObjectPic_Tate, 2, 4, 0), + overworld_frame(gEventObjectPic_Tate, 2, 4, 1), + overworld_frame(gEventObjectPic_Tate, 2, 4, 2), + overworld_frame(gEventObjectPic_Tate, 2, 4, 0), + overworld_frame(gEventObjectPic_Tate, 2, 4, 0), + overworld_frame(gEventObjectPic_Tate, 2, 4, 1), + overworld_frame(gEventObjectPic_Tate, 2, 4, 1), + overworld_frame(gEventObjectPic_Tate, 2, 4, 2), + overworld_frame(gEventObjectPic_Tate, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = { - obj_frame_tiles(gEventObjectPic_Wallace_0), - obj_frame_tiles(gEventObjectPic_Wallace_1), - obj_frame_tiles(gEventObjectPic_Wallace_2), - obj_frame_tiles(gEventObjectPic_Wallace_3), - obj_frame_tiles(gEventObjectPic_Wallace_4), - obj_frame_tiles(gEventObjectPic_Wallace_5), - obj_frame_tiles(gEventObjectPic_Wallace_6), - obj_frame_tiles(gEventObjectPic_Wallace_7), - obj_frame_tiles(gEventObjectPic_Wallace_8) + overworld_frame(gEventObjectPic_Wallace, 2, 4, 0), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 1), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 2), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 3), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 4), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 5), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 6), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 7), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Steven[] = { - obj_frame_tiles(gEventObjectPic_Steven_0), - obj_frame_tiles(gEventObjectPic_Steven_1), - obj_frame_tiles(gEventObjectPic_Steven_2), - obj_frame_tiles(gEventObjectPic_Steven_3), - obj_frame_tiles(gEventObjectPic_Steven_4), - obj_frame_tiles(gEventObjectPic_Steven_5), - obj_frame_tiles(gEventObjectPic_Steven_6), - obj_frame_tiles(gEventObjectPic_Steven_7), - obj_frame_tiles(gEventObjectPic_Steven_8) + overworld_frame(gEventObjectPic_Steven, 2, 4, 0), + overworld_frame(gEventObjectPic_Steven, 2, 4, 1), + overworld_frame(gEventObjectPic_Steven, 2, 4, 2), + overworld_frame(gEventObjectPic_Steven, 2, 4, 3), + overworld_frame(gEventObjectPic_Steven, 2, 4, 4), + overworld_frame(gEventObjectPic_Steven, 2, 4, 5), + overworld_frame(gEventObjectPic_Steven, 2, 4, 6), + overworld_frame(gEventObjectPic_Steven, 2, 4, 7), + overworld_frame(gEventObjectPic_Steven, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Wally[] = { - obj_frame_tiles(gEventObjectPic_Wally_0), - obj_frame_tiles(gEventObjectPic_Wally_1), - obj_frame_tiles(gEventObjectPic_Wally_2), - obj_frame_tiles(gEventObjectPic_Wally_3), - obj_frame_tiles(gEventObjectPic_Wally_4), - obj_frame_tiles(gEventObjectPic_Wally_5), - obj_frame_tiles(gEventObjectPic_Wally_6), - obj_frame_tiles(gEventObjectPic_Wally_7), - obj_frame_tiles(gEventObjectPic_Wally_8) + overworld_frame(gEventObjectPic_Wally, 2, 4, 0), + overworld_frame(gEventObjectPic_Wally, 2, 4, 1), + overworld_frame(gEventObjectPic_Wally, 2, 4, 2), + overworld_frame(gEventObjectPic_Wally, 2, 4, 3), + overworld_frame(gEventObjectPic_Wally, 2, 4, 4), + overworld_frame(gEventObjectPic_Wally, 2, 4, 5), + overworld_frame(gEventObjectPic_Wally, 2, 4, 6), + overworld_frame(gEventObjectPic_Wally, 2, 4, 7), + overworld_frame(gEventObjectPic_Wally, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy3[] = { - obj_frame_tiles(gEventObjectPic_LittleBoy3_0), - obj_frame_tiles(gEventObjectPic_LittleBoy3_1), - obj_frame_tiles(gEventObjectPic_LittleBoy3_2), - obj_frame_tiles(gEventObjectPic_LittleBoy3_3), - obj_frame_tiles(gEventObjectPic_LittleBoy3_4), - obj_frame_tiles(gEventObjectPic_LittleBoy3_5), - obj_frame_tiles(gEventObjectPic_LittleBoy3_6), - obj_frame_tiles(gEventObjectPic_LittleBoy3_7), - obj_frame_tiles(gEventObjectPic_LittleBoy3_8) + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = { - obj_frame_tiles(gEventObjectPic_BrendanFishing_0), - obj_frame_tiles(gEventObjectPic_BrendanFishing_1), - obj_frame_tiles(gEventObjectPic_BrendanFishing_2), - obj_frame_tiles(gEventObjectPic_BrendanFishing_3), - obj_frame_tiles(gEventObjectPic_BrendanFishing_4), - obj_frame_tiles(gEventObjectPic_BrendanFishing_5), - obj_frame_tiles(gEventObjectPic_BrendanFishing_6), - obj_frame_tiles(gEventObjectPic_BrendanFishing_7), - obj_frame_tiles(gEventObjectPic_BrendanFishing_8), - obj_frame_tiles(gEventObjectPic_BrendanFishing_9), - obj_frame_tiles(gEventObjectPic_BrendanFishing_10), - obj_frame_tiles(gEventObjectPic_BrendanFishing_11) + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 6), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 7), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 8), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 9), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 10), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 11) }; const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = { - obj_frame_tiles(gEventObjectPic_MayFishing_0), - obj_frame_tiles(gEventObjectPic_MayFishing_1), - obj_frame_tiles(gEventObjectPic_MayFishing_2), - obj_frame_tiles(gEventObjectPic_MayFishing_3), - obj_frame_tiles(gEventObjectPic_MayFishing_4), - obj_frame_tiles(gEventObjectPic_MayFishing_5), - obj_frame_tiles(gEventObjectPic_MayFishing_6), - obj_frame_tiles(gEventObjectPic_MayFishing_7), - obj_frame_tiles(gEventObjectPic_MayFishing_8), - obj_frame_tiles(gEventObjectPic_MayFishing_9), - obj_frame_tiles(gEventObjectPic_MayFishing_10), - obj_frame_tiles(gEventObjectPic_MayFishing_11) + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 0), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 1), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 2), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 3), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 4), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 5), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 6), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 7), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 8), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 9), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 10), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 11) }; const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = { - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_0), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_1), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_2), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_3), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_4), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_5), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_6), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_7), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_8) + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 0), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 1), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 2), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 3), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 4), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 5), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 6), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 7), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = { - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal) + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), + overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = { - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow) + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = { - obj_frame_tiles(gEventObjectPic_PichuDoll) + overworld_frame(gEventObjectPic_PichuDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_PikachuDoll) + overworld_frame(gEventObjectPic_PikachuDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = { - obj_frame_tiles(gEventObjectPic_MarillDoll) + overworld_frame(gEventObjectPic_MarillDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = { - obj_frame_tiles(gEventObjectPic_TogepiDoll) + overworld_frame(gEventObjectPic_TogepiDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = { - obj_frame_tiles(gEventObjectPic_CyndaquilDoll) + overworld_frame(gEventObjectPic_CyndaquilDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = { - obj_frame_tiles(gEventObjectPic_ChikoritaDoll) + overworld_frame(gEventObjectPic_ChikoritaDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = { - obj_frame_tiles(gEventObjectPic_TotodileDoll) + overworld_frame(gEventObjectPic_TotodileDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = { - obj_frame_tiles(gEventObjectPic_JigglypuffDoll) + overworld_frame(gEventObjectPic_JigglypuffDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = { - obj_frame_tiles(gEventObjectPic_MeowthDoll) + overworld_frame(gEventObjectPic_MeowthDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = { - obj_frame_tiles(gEventObjectPic_ClefairyDoll) + overworld_frame(gEventObjectPic_ClefairyDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = { - obj_frame_tiles(gEventObjectPic_DittoDoll) + overworld_frame(gEventObjectPic_DittoDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = { - obj_frame_tiles(gEventObjectPic_SmoochumDoll) + overworld_frame(gEventObjectPic_SmoochumDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = { - obj_frame_tiles(gEventObjectPic_TreeckoDoll) + overworld_frame(gEventObjectPic_TreeckoDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = { - obj_frame_tiles(gEventObjectPic_TorchicDoll) + overworld_frame(gEventObjectPic_TorchicDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = { - obj_frame_tiles(gEventObjectPic_MudkipDoll) + overworld_frame(gEventObjectPic_MudkipDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = { - obj_frame_tiles(gEventObjectPic_DuskullDoll) + overworld_frame(gEventObjectPic_DuskullDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = { - obj_frame_tiles(gEventObjectPic_WynautDoll) + overworld_frame(gEventObjectPic_WynautDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = { - obj_frame_tiles(gEventObjectPic_BaltoyDoll) + overworld_frame(gEventObjectPic_BaltoyDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = { - obj_frame_tiles(gEventObjectPic_KecleonDoll) + overworld_frame(gEventObjectPic_KecleonDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = { - obj_frame_tiles(gEventObjectPic_AzurillDoll) + overworld_frame(gEventObjectPic_AzurillDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = { - obj_frame_tiles(gEventObjectPic_SkittyDoll) + overworld_frame(gEventObjectPic_SkittyDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = { - obj_frame_tiles(gEventObjectPic_SwabluDoll) + overworld_frame(gEventObjectPic_SwabluDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = { - obj_frame_tiles(gEventObjectPic_GulpinDoll) + overworld_frame(gEventObjectPic_GulpinDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = { - obj_frame_tiles(gEventObjectPic_LotadDoll) + overworld_frame(gEventObjectPic_LotadDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = { - obj_frame_tiles(gEventObjectPic_SeedotDoll) + overworld_frame(gEventObjectPic_SeedotDoll, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = { - obj_frame_tiles(gEventObjectPic_PikaCushion) + overworld_frame(gEventObjectPic_PikaCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = { - obj_frame_tiles(gEventObjectPic_RoundCushion) + overworld_frame(gEventObjectPic_RoundCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = { - obj_frame_tiles(gEventObjectPic_KissCushion) + overworld_frame(gEventObjectPic_KissCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = { - obj_frame_tiles(gEventObjectPic_ZigzagCushion) + overworld_frame(gEventObjectPic_ZigzagCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = { - obj_frame_tiles(gEventObjectPic_SpinCushion) + overworld_frame(gEventObjectPic_SpinCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = { - obj_frame_tiles(gEventObjectPic_DiamondCushion) + overworld_frame(gEventObjectPic_DiamondCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = { - obj_frame_tiles(gEventObjectPic_BallCushion) + overworld_frame(gEventObjectPic_BallCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = { - obj_frame_tiles(gEventObjectPic_GrassCushion) + overworld_frame(gEventObjectPic_GrassCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = { - obj_frame_tiles(gEventObjectPic_FireCushion) + overworld_frame(gEventObjectPic_FireCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = { - obj_frame_tiles(gEventObjectPic_WaterCushion) + overworld_frame(gEventObjectPic_WaterCushion, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = { - obj_frame_tiles(gEventObjectPic_BigSnorlaxDoll) + overworld_frame(gEventObjectPic_BigSnorlaxDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRhydonDoll) + overworld_frame(gEventObjectPic_BigRhydonDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = { - obj_frame_tiles(gEventObjectPic_BigLaprasDoll) + overworld_frame(gEventObjectPic_BigLaprasDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = { - obj_frame_tiles(gEventObjectPic_BigVenusaurDoll) + overworld_frame(gEventObjectPic_BigVenusaurDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = { - obj_frame_tiles(gEventObjectPic_BigCharizardDoll) + overworld_frame(gEventObjectPic_BigCharizardDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = { - obj_frame_tiles(gEventObjectPic_BigBlastoiseDoll) + overworld_frame(gEventObjectPic_BigBlastoiseDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = { - obj_frame_tiles(gEventObjectPic_BigWailmerDoll) + overworld_frame(gEventObjectPic_BigWailmerDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegirockDoll) + overworld_frame(gEventObjectPic_BigRegirockDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegiceDoll) + overworld_frame(gEventObjectPic_BigRegiceDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegisteelDoll) + overworld_frame(gEventObjectPic_BigRegisteelDoll, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { - obj_frame_tiles(gEventObjectPic_LatiasLatios_0), - obj_frame_tiles(gEventObjectPic_LatiasLatios_0), - obj_frame_tiles(gEventObjectPic_LatiasLatios_0), - obj_frame_tiles(gEventObjectPic_LatiasLatios_1), - obj_frame_tiles(gEventObjectPic_LatiasLatios_2), - obj_frame_tiles(gEventObjectPic_LatiasLatios_1), - obj_frame_tiles(gEventObjectPic_LatiasLatios_2), - obj_frame_tiles(gEventObjectPic_LatiasLatios_1), - obj_frame_tiles(gEventObjectPic_LatiasLatios_2) + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = { - obj_frame_tiles(gEventObjectPic_Boy5_0), - obj_frame_tiles(gEventObjectPic_Boy5_1), - obj_frame_tiles(gEventObjectPic_Boy5_2), - obj_frame_tiles(gEventObjectPic_Boy5_0), - obj_frame_tiles(gEventObjectPic_Boy5_0), - obj_frame_tiles(gEventObjectPic_Boy5_1), - obj_frame_tiles(gEventObjectPic_Boy5_1), - obj_frame_tiles(gEventObjectPic_Boy5_2), - obj_frame_tiles(gEventObjectPic_Boy5_2) + overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 2) }; const struct SpriteFrameImage gEventObjectPicTable_ContestJudge[] = { - obj_frame_tiles(gEventObjectPic_ContestJudge_0), - obj_frame_tiles(gEventObjectPic_ContestJudge_1), - obj_frame_tiles(gEventObjectPic_ContestJudge_2), - obj_frame_tiles(gEventObjectPic_ContestJudge_3), - obj_frame_tiles(gEventObjectPic_ContestJudge_4), - obj_frame_tiles(gEventObjectPic_ContestJudge_5), - obj_frame_tiles(gEventObjectPic_ContestJudge_6), - obj_frame_tiles(gEventObjectPic_ContestJudge_7), - obj_frame_tiles(gEventObjectPic_ContestJudge_8) + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 0), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 1), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 2), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 3), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 4), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 5), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 6), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 7), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { - obj_frame_tiles(gEventObjectPic_BrendanWatering_0), - obj_frame_tiles(gEventObjectPic_BrendanWatering_1), - obj_frame_tiles(gEventObjectPic_BrendanWatering_2), - obj_frame_tiles(gEventObjectPic_BrendanWatering_3), - obj_frame_tiles(gEventObjectPic_BrendanWatering_3), - obj_frame_tiles(gEventObjectPic_BrendanWatering_4), - obj_frame_tiles(gEventObjectPic_BrendanWatering_4), - obj_frame_tiles(gEventObjectPic_BrendanWatering_5), - obj_frame_tiles(gEventObjectPic_BrendanWatering_5) + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5) }; const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = { - obj_frame_tiles(gEventObjectPic_MayWatering_0), - obj_frame_tiles(gEventObjectPic_MayWatering_1), - obj_frame_tiles(gEventObjectPic_MayWatering_2), - obj_frame_tiles(gEventObjectPic_MayWatering_3), - obj_frame_tiles(gEventObjectPic_MayWatering_3), - obj_frame_tiles(gEventObjectPic_MayWatering_4), - obj_frame_tiles(gEventObjectPic_MayWatering_4), - obj_frame_tiles(gEventObjectPic_MayWatering_5), - obj_frame_tiles(gEventObjectPic_MayWatering_5) + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 0), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 2), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 4), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5) }; const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = { - obj_frame_tiles(gEventObjectPic_BrendanDecorating) + overworld_frame(gEventObjectPic_BrendanDecorating, 2, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { - obj_frame_tiles(gEventObjectPic_MayDecorating) + overworld_frame(gEventObjectPic_MayDecorating, 2, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Archie[] = { - obj_frame_tiles(gEventObjectPic_Archie_0), - obj_frame_tiles(gEventObjectPic_Archie_1), - obj_frame_tiles(gEventObjectPic_Archie_2), - obj_frame_tiles(gEventObjectPic_Archie_3), - obj_frame_tiles(gEventObjectPic_Archie_4), - obj_frame_tiles(gEventObjectPic_Archie_5), - obj_frame_tiles(gEventObjectPic_Archie_6), - obj_frame_tiles(gEventObjectPic_Archie_7), - obj_frame_tiles(gEventObjectPic_Archie_8) + overworld_frame(gEventObjectPic_Archie, 2, 4, 0), + overworld_frame(gEventObjectPic_Archie, 2, 4, 1), + overworld_frame(gEventObjectPic_Archie, 2, 4, 2), + overworld_frame(gEventObjectPic_Archie, 2, 4, 3), + overworld_frame(gEventObjectPic_Archie, 2, 4, 4), + overworld_frame(gEventObjectPic_Archie, 2, 4, 5), + overworld_frame(gEventObjectPic_Archie, 2, 4, 6), + overworld_frame(gEventObjectPic_Archie, 2, 4, 7), + overworld_frame(gEventObjectPic_Archie, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = { - obj_frame_tiles(gEventObjectPic_Maxie_0), - obj_frame_tiles(gEventObjectPic_Maxie_1), - obj_frame_tiles(gEventObjectPic_Maxie_2), - obj_frame_tiles(gEventObjectPic_Maxie_3), - obj_frame_tiles(gEventObjectPic_Maxie_4), - obj_frame_tiles(gEventObjectPic_Maxie_5), - obj_frame_tiles(gEventObjectPic_Maxie_6), - obj_frame_tiles(gEventObjectPic_Maxie_7), - obj_frame_tiles(gEventObjectPic_Maxie_8) + overworld_frame(gEventObjectPic_Maxie, 2, 4, 0), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 1), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 2), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 3), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 4), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 5), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 6), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 7), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Kyogre[] = { - obj_frame_tiles(gEventObjectPic_Kyogre_0), - obj_frame_tiles(gEventObjectPic_Kyogre_0), - obj_frame_tiles(gEventObjectPic_Kyogre_0), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1), - obj_frame_tiles(gEventObjectPic_Kyogre_1) + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1) }; const struct SpriteFrameImage gEventObjectPicTable_Groudon[] = { - obj_frame_tiles(gEventObjectPic_Groudon_0), - obj_frame_tiles(gEventObjectPic_Groudon_0), - obj_frame_tiles(gEventObjectPic_Groudon_0), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1), - obj_frame_tiles(gEventObjectPic_Groudon_1) + overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1) }; const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = { - obj_frame_tiles(gEventObjectPic_Fossil) + overworld_frame(gEventObjectPic_Fossil, 2, 2, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi) + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0), + overworld_frame(gEventObjectPic_Regi, 4, 4, 0) }; const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = { - obj_frame_tiles(gEventObjectPic_Skitty_0), - obj_frame_tiles(gEventObjectPic_Skitty_1), - obj_frame_tiles(gEventObjectPic_Skitty_2), - obj_frame_tiles(gEventObjectPic_Skitty_0), - obj_frame_tiles(gEventObjectPic_Skitty_0), - obj_frame_tiles(gEventObjectPic_Skitty_1), - obj_frame_tiles(gEventObjectPic_Skitty_1), - obj_frame_tiles(gEventObjectPic_Skitty_2), - obj_frame_tiles(gEventObjectPic_Skitty_2) + overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = { - obj_frame_tiles(gEventObjectPic_Kecleon_0), - obj_frame_tiles(gEventObjectPic_Kecleon_1), - obj_frame_tiles(gEventObjectPic_Kecleon_2), - obj_frame_tiles(gEventObjectPic_Kecleon_0), - obj_frame_tiles(gEventObjectPic_Kecleon_0), - obj_frame_tiles(gEventObjectPic_Kecleon_1), - obj_frame_tiles(gEventObjectPic_Kecleon_1), - obj_frame_tiles(gEventObjectPic_Kecleon_2), - obj_frame_tiles(gEventObjectPic_Kecleon_2) + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = { - obj_frame_tiles(gEventObjectPic_Rayquaza_0), - obj_frame_tiles(gEventObjectPic_Rayquaza_0), - obj_frame_tiles(gEventObjectPic_Rayquaza_0), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_1) + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1) }; const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = { - obj_frame_tiles(gEventObjectPic_Zigzagoon_0), - obj_frame_tiles(gEventObjectPic_Zigzagoon_1), - obj_frame_tiles(gEventObjectPic_Zigzagoon_2), - obj_frame_tiles(gEventObjectPic_Zigzagoon_0), - obj_frame_tiles(gEventObjectPic_Zigzagoon_0), - obj_frame_tiles(gEventObjectPic_Zigzagoon_1), - obj_frame_tiles(gEventObjectPic_Zigzagoon_1), - obj_frame_tiles(gEventObjectPic_Zigzagoon_2), - obj_frame_tiles(gEventObjectPic_Zigzagoon_2) + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = { - obj_frame_tiles(gEventObjectPic_Pikachu_0), - obj_frame_tiles(gEventObjectPic_Pikachu_1), - obj_frame_tiles(gEventObjectPic_Pikachu_2), - obj_frame_tiles(gEventObjectPic_Pikachu_0), - obj_frame_tiles(gEventObjectPic_Pikachu_0), - obj_frame_tiles(gEventObjectPic_Pikachu_1), - obj_frame_tiles(gEventObjectPic_Pikachu_1), - obj_frame_tiles(gEventObjectPic_Pikachu_2), - obj_frame_tiles(gEventObjectPic_Pikachu_2) + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = { - obj_frame_tiles(gEventObjectPic_Azumarill_0), - obj_frame_tiles(gEventObjectPic_Azumarill_1), - obj_frame_tiles(gEventObjectPic_Azumarill_2), - obj_frame_tiles(gEventObjectPic_Azumarill_0), - obj_frame_tiles(gEventObjectPic_Azumarill_0), - obj_frame_tiles(gEventObjectPic_Azumarill_1), - obj_frame_tiles(gEventObjectPic_Azumarill_1), - obj_frame_tiles(gEventObjectPic_Azumarill_2), - obj_frame_tiles(gEventObjectPic_Azumarill_2) + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = { - obj_frame_tiles(gEventObjectPic_Wingull_0), - obj_frame_tiles(gEventObjectPic_Wingull_1), - obj_frame_tiles(gEventObjectPic_Wingull_2), - obj_frame_tiles(gEventObjectPic_Wingull_3), - obj_frame_tiles(gEventObjectPic_Wingull_3), - obj_frame_tiles(gEventObjectPic_Wingull_4), - obj_frame_tiles(gEventObjectPic_Wingull_4), - obj_frame_tiles(gEventObjectPic_Wingull_5), - obj_frame_tiles(gEventObjectPic_Wingull_5) + overworld_frame(gEventObjectPic_Wingull, 2, 2, 0), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 2), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 4), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 5) }; const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = { - obj_frame_tiles(gEventObjectPic_TuberMSwimming_0), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_1), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_2), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_3), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_4), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_5), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_6), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_7), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_8) + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 0), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 1), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 2), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 3), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 4), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 5), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 6), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 7), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 8) }; const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = { - obj_frame_tiles(gEventObjectPic_Azurill_0), - obj_frame_tiles(gEventObjectPic_Azurill_1), - obj_frame_tiles(gEventObjectPic_Azurill_2), - obj_frame_tiles(gEventObjectPic_Azurill_0), - obj_frame_tiles(gEventObjectPic_Azurill_0), - obj_frame_tiles(gEventObjectPic_Azurill_1), - obj_frame_tiles(gEventObjectPic_Azurill_1), - obj_frame_tiles(gEventObjectPic_Azurill_2), - obj_frame_tiles(gEventObjectPic_Azurill_2) + overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 2) }; const struct SpriteFrameImage gEventObjectPicTable_Mom[] = { - obj_frame_tiles(gEventObjectPic_Mom_0), - obj_frame_tiles(gEventObjectPic_Mom_1), - obj_frame_tiles(gEventObjectPic_Mom_2), - obj_frame_tiles(gEventObjectPic_Mom_3), - obj_frame_tiles(gEventObjectPic_Mom_4), - obj_frame_tiles(gEventObjectPic_Mom_5), - obj_frame_tiles(gEventObjectPic_Mom_6), - obj_frame_tiles(gEventObjectPic_Mom_7), - obj_frame_tiles(gEventObjectPic_Mom_8), + overworld_frame(gEventObjectPic_Mom, 2, 4, 0), + overworld_frame(gEventObjectPic_Mom, 2, 4, 1), + overworld_frame(gEventObjectPic_Mom, 2, 4, 2), + overworld_frame(gEventObjectPic_Mom, 2, 4, 3), + overworld_frame(gEventObjectPic_Mom, 2, 4, 4), + overworld_frame(gEventObjectPic_Mom, 2, 4, 5), + overworld_frame(gEventObjectPic_Mom, 2, 4, 6), + overworld_frame(gEventObjectPic_Mom, 2, 4, 7), + overworld_frame(gEventObjectPic_Mom, 2, 4, 8), }; #endif //POKERUBY_EVENT_OBJECT_PIC_TABLES_H diff --git a/src/data/field_event_obj/field_effect_object_graphics.h b/src/data/field_event_obj/field_effect_object_graphics.h index 36850a4ec..e06fc7260 100644 --- a/src/data/field_event_obj/field_effect_object_graphics.h +++ b/src/data/field_event_obj/field_effect_object_graphics.h @@ -9,140 +9,39 @@ const u32 filler_8368A08[0x48] = {}; const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effect_objects/pics/cut_grass.4bpp"); const u32 FieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effect_objects/pics/cut_grass.4bpp"); const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effect_objects/palettes/06.gbapal"); -const u32 gFieldEffectPic_Ripple_0[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/0.4bpp"); -const u32 gFieldEffectPic_Ripple_1[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/1.4bpp"); -const u32 gFieldEffectPic_Ripple_2[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/2.4bpp"); -const u32 gFieldEffectPic_Ripple_3[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/3.4bpp"); -const u32 gFieldEffectPic_Ripple_4[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/4.4bpp"); -const u32 gFieldEffectPic_Ash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/0.4bpp"); -const u32 gFieldEffectPic_Ash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/1.4bpp"); -const u32 gFieldEffectPic_Ash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/2.4bpp"); -const u32 gFieldEffectPic_Ash_3[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/3.4bpp"); -const u32 gFieldEffectPic_Ash_4[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/4.4bpp"); -const u32 gFieldEffectPic_Arrow_0[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/0.4bpp"); -const u32 gFieldEffectPic_Arrow_1[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/1.4bpp"); -const u32 gFieldEffectPic_Arrow_2[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/2.4bpp"); -const u32 gFieldEffectPic_Arrow_3[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/3.4bpp"); -const u32 gFieldEffectPic_Arrow_4[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/4.4bpp"); -const u32 gFieldEffectPic_Arrow_5[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/5.4bpp"); -const u32 gFieldEffectPic_Arrow_6[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/6.4bpp"); -const u32 gFieldEffectPic_Arrow_7[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/7.4bpp"); +const u32 gFieldEffectPic_Ripple[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple.4bpp"); +const u32 gFieldEffectPic_Ash[] = INCBIN_U32("graphics/field_effect_objects/pics/ash.4bpp"); +const u32 gFieldEffectPic_Arrow[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow.4bpp"); const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effect_objects/palettes/00.gbapal"); const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effect_objects/palettes/01.gbapal"); -const u32 gFieldEffectPic_Dust_0[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/0.4bpp"); -const u32 gFieldEffectPic_Dust_1[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/1.4bpp"); -const u32 gFieldEffectPic_Dust_2[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/2.4bpp"); +const u32 gFieldEffectPic_Dust[] = INCBIN_U32("graphics/field_effect_objects/pics/dust.4bpp"); const u32 unknown_8369588[] = INCBIN_U32("graphics/field_effect_objects/unknown.bin"); -const u32 gFieldEffectPic_JumpTallGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/0.4bpp"); -const u32 gFieldEffectPic_JumpTallGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/1.4bpp"); -const u32 gFieldEffectPic_JumpTallGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/2.4bpp"); -const u32 gFieldEffectPic_JumpTallGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/3.4bpp"); -const u32 UnusedGrass0[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/0.4bpp"); -const u32 UnusedGrass1[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/1.4bpp"); -const u32 UnusedGrass2[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/2.4bpp"); -const u32 UnusedGrass3[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/3.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/0.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/1.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/2.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/3.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_4[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/4.4bpp"); -const u32 UnusedGrassLong[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/unused.4bpp"); -const u32 gFieldEffectPic_JumpLongGrass_5[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/5.4bpp"); -const u32 gFieldEffectPic_Unknown17_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/0.4bpp"); -const u32 gFieldEffectPic_Unknown17_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/1.4bpp"); -const u32 gFieldEffectPic_Unknown17_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/2.4bpp"); -const u32 gFieldEffectPic_Unknown17_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/3.4bpp"); -const u32 gFieldEffectPic_Unknown17_4[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/4.4bpp"); -const u32 gFieldEffectPic_Unknown17_5[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/5.4bpp"); -const u32 gFieldEffectPic_Unknown17_6[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/6.4bpp"); -const u32 gFieldEffectPic_Unknown17_7[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/7.4bpp"); -const u32 gFieldEffectPic_Unknown18_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/0.4bpp"); -const u32 gFieldEffectPic_Unknown18_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/1.4bpp"); -const u32 gFieldEffectPic_Unknown18_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/2.4bpp"); -const u32 gFieldEffectPic_Unknown18_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/3.4bpp"); -const u32 gFieldEffectPic_LongGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/0.4bpp"); -const u32 gFieldEffectPic_LongGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/1.4bpp"); -const u32 gFieldEffectPic_LongGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/2.4bpp"); -const u32 gFieldEffectPic_LongGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/3.4bpp"); -const u32 gFieldEffectPic_TallGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/0.4bpp"); -const u32 gFieldEffectPic_TallGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/1.4bpp"); -const u32 gFieldEffectPic_TallGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/2.4bpp"); -const u32 gFieldEffectPic_TallGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/3.4bpp"); -const u32 gFieldEffectPic_TallGrass_4[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/4.4bpp"); -const u32 gFieldEffectPic_ShortGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass/0.4bpp"); -const u32 gFieldEffectPic_ShortGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass/1.4bpp"); -const u32 gFieldEffectPic_SandFootprints_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints/0.4bpp"); -const u32 gFieldEffectPic_SandFootprints_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints/1.4bpp"); -const u32 gFieldEffectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints/0.4bpp"); -const u32 gFieldEffectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints/1.4bpp"); -const u32 gFieldEffectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/0.4bpp"); -const u32 gFieldEffectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/1.4bpp"); -const u32 gFieldEffectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/2.4bpp"); -const u32 gFieldEffectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/3.4bpp"); -const u32 gFieldEffectPic_Unknown19_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/0.4bpp"); -const u32 gFieldEffectPic_Unknown19_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/1.4bpp"); -const u32 gFieldEffectPic_Unknown19_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/2.4bpp"); -const u32 gFieldEffectPic_Unknown19_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/3.4bpp"); -const u32 gFieldEffectPic_SandPile_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/0.4bpp"); -const u32 gFieldEffectPic_SandPile_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/1.4bpp"); -const u32 gFieldEffectPic_SandPile_2[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/2.4bpp"); -const u32 gFieldEffectPic_JumpBigSplash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/0.4bpp"); -const u32 gFieldEffectPic_JumpBigSplash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/1.4bpp"); -const u32 gFieldEffectPic_JumpBigSplash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/2.4bpp"); -const u32 gFieldEffectPic_JumpBigSplash_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/3.4bpp"); -const u32 gFieldEffectPic_Splash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/splash/0.4bpp"); -const u32 gFieldEffectPic_Splash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/splash/1.4bpp"); -const u32 gFieldEffectPic_JumpSmallSplash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/0.4bpp"); -const u32 gFieldEffectPic_JumpSmallSplash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/1.4bpp"); -const u32 gFieldEffectPic_JumpSmallSplash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/2.4bpp"); -const u32 gFieldEffectPic_Unknown20_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/0.4bpp"); -const u32 gFieldEffectPic_Unknown20_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/1.4bpp"); -const u32 gFieldEffectPic_Unknown20_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/2.4bpp"); -const u32 gFieldEffectPic_Unknown20_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/3.4bpp"); -const u32 gFieldEffectPic_Unknown20_4[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/4.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/0.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/1.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/2.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/3.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/4.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/5.4bpp"); -const u32 gFieldEffectPic_TreeDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/6.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/0.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/1.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/2.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/3.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/4.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/5.4bpp"); -const u32 gFieldEffectPic_MountainDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/6.4bpp"); -const u32 gFieldEffectPic_SandDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/0.4bpp"); -const u32 gFieldEffectPic_SandDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/1.4bpp"); -const u32 gFieldEffectPic_SandDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/2.4bpp"); -const u32 gFieldEffectPic_SandDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/3.4bpp"); -const u32 gFieldEffectPic_SandDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/4.4bpp"); -const u32 gFieldEffectPic_SandDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/5.4bpp"); -const u32 gFieldEffectPic_SandDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/6.4bpp"); +const u32 gFieldEffectPic_JumpTallGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass.4bpp"); +const u32 gFieldEffectPic_UnusedGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass.4bpp"); +const u32 gFieldEffectPic_JumpLongGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass.4bpp"); +const u32 gFieldEffectPic_Unknown17[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17.4bpp"); +const u32 gFieldEffectPic_Unknown18[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18.4bpp"); +const u32 gFieldEffectPic_LongGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass.4bpp"); +const u32 gFieldEffectPic_TallGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass.4bpp"); +const u32 gFieldEffectPic_ShortGrass[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass.4bpp"); +const u32 gFieldEffectPic_SandFootprints[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints.4bpp"); +const u32 gFieldEffectPic_DeepSandFootprints[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints.4bpp"); +const u32 gFieldEffectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks.4bpp"); +const u32 gFieldEffectPic_Unknown19[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19.4bpp"); +const u32 gFieldEffectPic_SandPile[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile.4bpp"); +const u32 gFieldEffectPic_JumpBigSplash[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash.4bpp"); +const u32 gFieldEffectPic_Splash[] = INCBIN_U32("graphics/field_effect_objects/pics/splash.4bpp"); +const u32 gFieldEffectPic_JumpSmallSplash[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash.4bpp"); +const u32 gFieldEffectPic_Unknown20[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20.4bpp"); +const u32 gFieldEffectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise.4bpp"); +const u32 gFieldEffectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise.4bpp"); +const u32 gFieldEffectPic_SandDisguise[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise.4bpp"); const u32 gFieldEffectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effect_objects/pics/hot_springs_water.4bpp"); const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effect_objects/palettes/02.gbapal"); -const u32 gFieldEffectPic_PopOutOfAsh_0[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/0.4bpp"); -const u32 gFieldEffectPic_PopOutOfAsh_1[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/1.4bpp"); -const u32 gFieldEffectPic_PopOutOfAsh_2[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/2.4bpp"); -const u32 gFieldEffectPic_PopOutOfAsh_3[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/3.4bpp"); -const u32 gFieldEffectPic_PopOutOfAsh_4[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/4.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_0[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/0.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_1[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/1.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_2[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/2.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_3[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/3.4bpp"); -const u32 gFieldEffectPic_LavaridgeGymWarp_4[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/4.4bpp"); -const u32 gFieldEffectPic_Bubbles_0[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/0.4bpp"); -const u32 gFieldEffectPic_Bubbles_1[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/1.4bpp"); -const u32 gFieldEffectPic_Bubbles_2[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/2.4bpp"); -const u32 gFieldEffectPic_Bubbles_3[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/3.4bpp"); -const u32 gFieldEffectPic_Bubbles_4[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/4.4bpp"); -const u32 gFieldEffectPic_Bubbles_5[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/5.4bpp"); -const u32 gFieldEffectPic_Bubbles_6[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/6.4bpp"); -const u32 gFieldEffectPic_Bubbles_7[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/7.4bpp"); -const u32 gFieldEffectPic_Sparkle_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle/0.4bpp"); -const u32 gFieldEffectPic_Sparkle_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle/1.4bpp"); +const u32 gFieldEffectPic_PopOutOfAsh[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash.4bpp"); +const u32 gFieldEffectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp.4bpp"); +const u32 gFieldEffectPic_Bubbles[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles.4bpp"); +const u32 gFieldEffectPic_Sparkle[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle.4bpp"); const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effect_objects/palettes/03.gbapal"); const u32 gFieldEffectPic_Bird[] = INCBIN_U32("graphics/field_effect_objects/pics/bird.4bpp"); diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h index 8533b3cdd..d5d2f2016 100644 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/field_event_obj/field_effect_objects.h @@ -19,19 +19,19 @@ const union AnimCmd *const gFieldEffectAnimTable_Shadow[] = { }; const struct SpriteFrameImage gFieldEffectPicTable_ShadowSmall[] = { - obj_frame_tiles(gFieldEffectPic_ShadowSmall) + overworld_frame(gFieldEffectPic_ShadowSmall, 1, 1, 0) }; const struct SpriteFrameImage gFieldEffectPicTable_ShadowMedium[] = { - obj_frame_tiles(gFieldEffectPic_ShadowMedium) + overworld_frame(gFieldEffectPic_ShadowMedium, 2, 1, 0) }; const struct SpriteFrameImage gFieldEffectPicTable_ShadowLarge[] = { - obj_frame_tiles(gFieldEffectPic_ShadowLarge) + overworld_frame(gFieldEffectPic_ShadowLarge, 4, 1, 0) }; const struct SpriteFrameImage gFieldEffectPicTable_ShadowExtraLarge[] = { - obj_frame_tiles(gFieldEffectPic_ShadowExtraLarge) + overworld_frame(gFieldEffectPic_ShadowExtraLarge, 8, 4, 0) }; const struct SpriteTemplate gFieldEffectSpriteTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gFieldOamData_8x8, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; @@ -43,11 +43,11 @@ const struct SpriteTemplate gFieldEffectSpriteTemplate_ShadowLarge = {0xFFFF, 0x const struct SpriteTemplate gFieldEffectSpriteTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gFieldOamData_64x32, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_TallGrass[] = { - obj_frame_tiles(gFieldEffectPic_TallGrass_0), - obj_frame_tiles(gFieldEffectPic_TallGrass_1), - obj_frame_tiles(gFieldEffectPic_TallGrass_2), - obj_frame_tiles(gFieldEffectPic_TallGrass_3), - obj_frame_tiles(gFieldEffectPic_TallGrass_4) + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 0), + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 1), + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 2), + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 3), + overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_83745E8[] = { @@ -66,11 +66,11 @@ const union AnimCmd *const gFieldEffectAnimTable_TallGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_TallGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_TallGrass, gFieldEffectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Ripple[] = { - obj_frame_tiles(gFieldEffectPic_Ripple_0), - obj_frame_tiles(gFieldEffectPic_Ripple_1), - obj_frame_tiles(gFieldEffectPic_Ripple_2), - obj_frame_tiles(gFieldEffectPic_Ripple_3), - obj_frame_tiles(gFieldEffectPic_Ripple_4) + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 0), + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 1), + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 2), + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 3), + overworld_frame(gFieldEffectPic_Ripple, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_8374644[] = { @@ -92,11 +92,11 @@ const union AnimCmd *const gFieldEffectAnimTable_Ripple[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Ripple = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Ripple, gFieldEffectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_Ash[] = { - obj_frame_tiles(gFieldEffectPic_Ash_0), - obj_frame_tiles(gFieldEffectPic_Ash_1), - obj_frame_tiles(gFieldEffectPic_Ash_2), - obj_frame_tiles(gFieldEffectPic_Ash_3), - obj_frame_tiles(gFieldEffectPic_Ash_4) + overworld_frame(gFieldEffectPic_Ash, 2, 2, 0), + overworld_frame(gFieldEffectPic_Ash, 2, 2, 1), + overworld_frame(gFieldEffectPic_Ash, 2, 2, 2), + overworld_frame(gFieldEffectPic_Ash, 2, 2, 3), + overworld_frame(gFieldEffectPic_Ash, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_83746AC[] = { @@ -115,9 +115,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Ash[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Ash = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Ash, gFieldEffectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_SurfBlob[] = { - obj_frame_tiles(gFieldEffectPic_SurfBlob_0), - obj_frame_tiles(gFieldEffectPic_SurfBlob_1), - obj_frame_tiles(gFieldEffectPic_SurfBlob_2) + overworld_frame(gFieldEffectPic_SurfBlob, 4, 4, 0), + overworld_frame(gFieldEffectPic_SurfBlob, 4, 4, 1), + overworld_frame(gFieldEffectPic_SurfBlob, 4, 4, 2) }; const union AnimCmd gFieldEffectAnim_83746F8[] = { @@ -150,14 +150,14 @@ const union AnimCmd *const gFieldEffectAnimTable_SurfBlob[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gFieldOamData_32x32, gFieldEffectAnimTable_SurfBlob, gFieldEffectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Arrow[] = { - obj_frame_tiles(gFieldEffectPic_Arrow_0), - obj_frame_tiles(gFieldEffectPic_Arrow_1), - obj_frame_tiles(gFieldEffectPic_Arrow_2), - obj_frame_tiles(gFieldEffectPic_Arrow_3), - obj_frame_tiles(gFieldEffectPic_Arrow_4), - obj_frame_tiles(gFieldEffectPic_Arrow_5), - obj_frame_tiles(gFieldEffectPic_Arrow_6), - obj_frame_tiles(gFieldEffectPic_Arrow_7) + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 0), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 1), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 2), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 3), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 4), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 5), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 6), + overworld_frame(gFieldEffectPic_Arrow, 2, 2, 7) }; const union AnimCmd gFieldEffectAnim_8374780[] = { @@ -194,9 +194,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Arrow[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Arrow = {0xFFFF, 0xFFFF, &gFieldOamData_16x16, gFieldEffectAnimTable_Arrow, gFieldEffectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectPicTable_Dust[] = { - obj_frame_tiles(gFieldEffectPic_Dust_0), - obj_frame_tiles(gFieldEffectPic_Dust_1), - obj_frame_tiles(gFieldEffectPic_Dust_2) + overworld_frame(gFieldEffectPic_Dust, 2, 1, 0), + overworld_frame(gFieldEffectPic_Dust, 2, 1, 1), + overworld_frame(gFieldEffectPic_Dust, 2, 1, 2) }; const union AnimCmd gFieldEffectAnim_83747F0[] = { @@ -213,10 +213,10 @@ const union AnimCmd *const gFieldEffectAnimTable_Dust[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Dust = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_Dust, gFieldEffectPicTable_Dust, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_JumpTallGrass[] = { - obj_frame_tiles(gFieldEffectPic_JumpTallGrass_0), - obj_frame_tiles(gFieldEffectPic_JumpTallGrass_1), - obj_frame_tiles(gFieldEffectPic_JumpTallGrass_2), - obj_frame_tiles(gFieldEffectPic_JumpTallGrass_3) + overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 0), + overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 1), + overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 2), + overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 3) }; const union AnimCmd gFieldEffectAnim_837483C[] = { @@ -234,8 +234,8 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpTallGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpTallGrass = {0xFFFF, 0x1005, &gFieldOamData_16x8, gFieldEffectAnimTable_JumpTallGrass, gFieldEffectPicTable_JumpTallGrass, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_SandFootprints[] = { - obj_frame_tiles(gFieldEffectPic_SandFootprints_0), - obj_frame_tiles(gFieldEffectPic_SandFootprints_1) + overworld_frame(gFieldEffectPic_SandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectPic_SandFootprints, 2, 2, 1) }; const union AnimCmd gFieldEffectAnim_837487C[] = { @@ -269,8 +269,8 @@ const union AnimCmd *const gFieldEffectAnimTable_SandFootprints[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_SandFootprints = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_SandFootprints, gFieldEffectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_DeepSandFootprints[] = { - obj_frame_tiles(gFieldEffectPic_DeepSandFootprints_0), - obj_frame_tiles(gFieldEffectPic_DeepSandFootprints_1) + overworld_frame(gFieldEffectPic_DeepSandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectPic_DeepSandFootprints, 2, 2, 1) }; const union AnimCmd gFieldEffectAnim_83748D8[] = { @@ -304,10 +304,10 @@ const union AnimCmd *const gFieldEffectAnimTable_DeepSandFootprints[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_DeepSandFootprints, gFieldEffectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_BikeTireTracks[] = { - obj_frame_tiles(gFieldEffectPic_BikeTireTracks_0), - obj_frame_tiles(gFieldEffectPic_BikeTireTracks_1), - obj_frame_tiles(gFieldEffectPic_BikeTireTracks_2), - obj_frame_tiles(gFieldEffectPic_BikeTireTracks_3) + overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 0), + overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 1), + overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 2), + overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374944[] = { @@ -365,10 +365,10 @@ const union AnimCmd *const gFieldEffectAnimTable_BikeTireTracks[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_BikeTireTracks, gFieldEffectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_JumpBigSplash[] = { - obj_frame_tiles(gFieldEffectPic_JumpBigSplash_0), - obj_frame_tiles(gFieldEffectPic_JumpBigSplash_1), - obj_frame_tiles(gFieldEffectPic_JumpBigSplash_2), - obj_frame_tiles(gFieldEffectPic_JumpBigSplash_3) + overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 0), + overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 1), + overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 2), + overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_83749E0[] = { @@ -386,8 +386,8 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpBigSplash[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpBigSplash = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_JumpBigSplash, gFieldEffectPicTable_JumpBigSplash, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Splash[] = { - obj_frame_tiles(gFieldEffectPic_Splash_0), - obj_frame_tiles(gFieldEffectPic_Splash_1) + overworld_frame(gFieldEffectPic_Splash, 2, 1, 0), + overworld_frame(gFieldEffectPic_Splash, 2, 1, 1) }; const union AnimCmd gFieldEffectAnim_8374A20[] = { @@ -416,9 +416,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Splash[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Splash = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_Splash, gFieldEffectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_JumpSmallSplash[] = { - obj_frame_tiles(gFieldEffectPic_JumpSmallSplash_0), - obj_frame_tiles(gFieldEffectPic_JumpSmallSplash_1), - obj_frame_tiles(gFieldEffectPic_JumpSmallSplash_2) + overworld_frame(gFieldEffectPic_JumpSmallSplash, 2, 1, 0), + overworld_frame(gFieldEffectPic_JumpSmallSplash, 2, 1, 1), + overworld_frame(gFieldEffectPic_JumpSmallSplash, 2, 1, 2) }; const union AnimCmd gFieldEffectAnim_8374A88[] = { @@ -435,10 +435,10 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpSmallSplash[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpSmallSplash = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_JumpSmallSplash, gFieldEffectPicTable_JumpSmallSplash, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_LongGrass[] = { - obj_frame_tiles(gFieldEffectPic_LongGrass_0), - obj_frame_tiles(gFieldEffectPic_LongGrass_1), - obj_frame_tiles(gFieldEffectPic_LongGrass_2), - obj_frame_tiles(gFieldEffectPic_LongGrass_3) + overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 0), + overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 1), + overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 2), + overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374AD4[] = { @@ -459,12 +459,12 @@ const union AnimCmd *const gFieldEffectAnimTable_LongGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_LongGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_LongGrass, gFieldEffectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_JumpLongGrass[] = { - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_0), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_1), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_2), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_3), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_4), - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_5) + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 0), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 1), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 2), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 3), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 4), + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 6) }; const union AnimCmd gFieldEffectAnim_8374B40[] = { @@ -484,15 +484,15 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpLongGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpLongGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_JumpLongGrass, gFieldEffectPicTable_JumpLongGrass, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Unknown17[] = { - obj_frame_tiles(gFieldEffectPic_JumpLongGrass_5), - obj_frame_tiles(gFieldEffectPic_Unknown17_0), - obj_frame_tiles(gFieldEffectPic_Unknown17_1), - obj_frame_tiles(gFieldEffectPic_Unknown17_2), - obj_frame_tiles(gFieldEffectPic_Unknown17_3), - obj_frame_tiles(gFieldEffectPic_Unknown17_4), - obj_frame_tiles(gFieldEffectPic_Unknown17_5), - obj_frame_tiles(gFieldEffectPic_Unknown17_6), - obj_frame_tiles(gFieldEffectPic_Unknown17_7) + overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 6), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 0), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 1), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 2), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 3), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 4), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 5), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 6), + overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 7) }; const union AnimCmd gFieldEffectAnim_8374BC0[] = { @@ -515,10 +515,10 @@ const union AnimCmd *const gFieldEffectAnimTable_Unknown17[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Unknown17 = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Unknown17, gFieldEffectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_Unknown18[] = { - obj_frame_tiles(gFieldEffectPic_Unknown18_0), - obj_frame_tiles(gFieldEffectPic_Unknown18_1), - obj_frame_tiles(gFieldEffectPic_Unknown18_2), - obj_frame_tiles(gFieldEffectPic_Unknown18_3) + overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 0), + overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 1), + overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 2), + overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374C24[] = { @@ -538,10 +538,10 @@ const union AnimCmd *const gFieldEffectAnimTable_Unknown18[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Unknown18 = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Unknown18, gFieldEffectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_Unknown19[] = { - obj_frame_tiles(gFieldEffectPic_Unknown19_0), - obj_frame_tiles(gFieldEffectPic_Unknown19_1), - obj_frame_tiles(gFieldEffectPic_Unknown19_2), - obj_frame_tiles(gFieldEffectPic_Unknown19_3) + overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 0), + overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 1), + overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 2), + overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374C7C[] = { @@ -559,9 +559,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Unknown19[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Unknown19 = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_Unknown19, gFieldEffectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_SandPile[] = { - obj_frame_tiles(gFieldEffectPic_SandPile_0), - obj_frame_tiles(gFieldEffectPic_SandPile_1), - obj_frame_tiles(gFieldEffectPic_SandPile_2) + overworld_frame(gFieldEffectPic_SandPile, 2, 1, 0), + overworld_frame(gFieldEffectPic_SandPile, 2, 1, 1), + overworld_frame(gFieldEffectPic_SandPile, 2, 1, 2) }; const union AnimCmd gFieldEffectAnim_8374CC4[] = { @@ -578,10 +578,10 @@ const union AnimCmd *const gFieldEffectAnimTable_SandPile[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_SandPile = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_SandPile, gFieldEffectPicTable_SandPile, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Unknown20[] = { - obj_frame_tiles(gFieldEffectPic_Unknown20_0), - obj_frame_tiles(gFieldEffectPic_Unknown20_1), - obj_frame_tiles(gFieldEffectPic_Unknown20_2), - obj_frame_tiles(gFieldEffectPic_Unknown20_3) + overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 0), + overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 1), + overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 2), + overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 3) }; const union AnimCmd gFieldEffectAnim_8374D10[] = { @@ -634,12 +634,12 @@ const union AffineAnimCmd *const gFieldEffectAffineAnimTable_Reflection[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Reflection = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectAffineAnimTable_Reflection, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectPicTable_BerryTreeGrowthSparkle[] = { - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_0), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_1), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_2), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_3), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_4), - obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_5) + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 0), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 1), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 2), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 3), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 4), + overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 5) }; const union AnimCmd gFieldEffectAnim_8374E38[] = { @@ -673,13 +673,13 @@ const union AnimCmd *const gFieldEffectAnimTable_BerryTreeGrowthSparkle[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gFieldOamData_16x16, gFieldEffectAnimTable_BerryTreeGrowthSparkle, gFieldEffectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectPicTable_TreeDisguise[] = { - obj_frame_tiles(gFieldEffectPic_TreeDisguise_0), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_1), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_2), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_3), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_4), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_5), - obj_frame_tiles(gFieldEffectPic_TreeDisguise_6) + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 0), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 1), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 2), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 3), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 4), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 5), + overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 6) }; const union AnimCmd gFieldEffectAnim_8374EE0[] = { @@ -706,13 +706,13 @@ const union AnimCmd *const gFieldEffectAnimTable_TreeDisguise[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gFieldOamData_16x32, gFieldEffectAnimTable_TreeDisguise, gFieldEffectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_MountainDisguise[] = { - obj_frame_tiles(gFieldEffectPic_MountainDisguise_0), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_1), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_2), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_3), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_4), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_5), - obj_frame_tiles(gFieldEffectPic_MountainDisguise_6) + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 0), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 1), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 2), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 3), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 4), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 5), + overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 6) }; const union AnimCmd gFieldEffectAnim_8374F60[] = { @@ -739,19 +739,19 @@ const union AnimCmd *const gFieldEffectAnimTable_MountainDisguise[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gFieldOamData_16x32, gFieldEffectAnimTable_MountainDisguise, gFieldEffectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_SandDisguise[] = { - obj_frame_tiles(gFieldEffectPic_SandDisguise_0), - obj_frame_tiles(gFieldEffectPic_SandDisguise_1), - obj_frame_tiles(gFieldEffectPic_SandDisguise_2), - obj_frame_tiles(gFieldEffectPic_SandDisguise_3), - obj_frame_tiles(gFieldEffectPic_SandDisguise_4), - obj_frame_tiles(gFieldEffectPic_SandDisguise_5), - obj_frame_tiles(gFieldEffectPic_SandDisguise_6) + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 0), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 1), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 2), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 3), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 4), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 5), + overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 6) }; const struct SpriteTemplate gFieldEffectSpriteTemplate_SandDisguise = {0xFFFF, 0xFFFF, &gFieldOamData_16x32, gFieldEffectAnimTable_TreeDisguise, gFieldEffectPicTable_SandDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Bird[] = { - obj_frame_tiles(gFieldEffectPic_Bird) + overworld_frame(gFieldEffectPic_Bird, 4, 4, 0) }; const union AnimCmd gFieldEffectAnim_8375000[] = { @@ -766,8 +766,8 @@ const union AnimCmd *const gFieldEffectAnimTable_Bird[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Bird = {0xFFFF, 0xFFFF, &gFieldOamData_32x32, gFieldEffectAnimTable_Bird, gFieldEffectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectPicTable_ShortGrass[] = { - obj_frame_tiles(gFieldEffectPic_ShortGrass_0), - obj_frame_tiles(gFieldEffectPic_ShortGrass_1) + overworld_frame(gFieldEffectPic_ShortGrass, 2, 2, 0), + overworld_frame(gFieldEffectPic_ShortGrass, 2, 2, 1) }; const union AnimCmd gFieldEffectAnim_8375034[] = { @@ -783,7 +783,7 @@ const union AnimCmd *const gFieldEffectAnimTable_ShortGrass[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_ShortGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_ShortGrass, gFieldEffectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_HotSpringsWater[] = { - obj_frame_tiles(gFieldEffectPic_HotSpringsWater) + overworld_frame(gFieldEffectPic_HotSpringsWater, 2, 2, 0) }; const union AnimCmd gFieldEffectAnim_8375064[] = { @@ -798,11 +798,11 @@ const union AnimCmd *const gFieldEffectAnimTable_HotSpringsWater[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_HotSpringsWater, gFieldEffectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_PopOutOfAsh[] = { - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_0), - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_1), - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_2), - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_3), - obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_4) + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 0), + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 1), + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 2), + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 3), + overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_83750B0[] = { @@ -823,11 +823,11 @@ const struct SpriteTemplate gFieldEffectSpriteTemplate_PopOutOfAsh = {0xFFFF, 0x const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; const struct SpriteFrameImage gFieldEffectPicTable_LavaridgeGymWarp[] = { - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_0), - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_1), - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_2), - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_3), - obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_4) + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 0), + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 1), + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 2), + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 3), + overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 4) }; const union AnimCmd gFieldEffectAnim_8375114[] = { @@ -846,14 +846,14 @@ const union AnimCmd *const gFieldEffectAnimTable_LavaridgeGymWarp[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_LavaridgeGymWarp = {0xFFFF, 0x100D, &gFieldOamData_16x16, gFieldEffectAnimTable_LavaridgeGymWarp, gFieldEffectPicTable_LavaridgeGymWarp, gDummySpriteAffineAnimTable, sub_8087638}; const struct SpriteFrameImage gFieldEffectPicTable_Bubbles[] = { - obj_frame_tiles(gFieldEffectPic_Bubbles_0), - obj_frame_tiles(gFieldEffectPic_Bubbles_1), - obj_frame_tiles(gFieldEffectPic_Bubbles_2), - obj_frame_tiles(gFieldEffectPic_Bubbles_3), - obj_frame_tiles(gFieldEffectPic_Bubbles_4), - obj_frame_tiles(gFieldEffectPic_Bubbles_5), - obj_frame_tiles(gFieldEffectPic_Bubbles_6), - obj_frame_tiles(gFieldEffectPic_Bubbles_7) + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 0), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 1), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 2), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 3), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 4), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 5), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 6), + overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 7) }; const union AnimCmd gFieldEffectAnim_8375188[] = { @@ -875,8 +875,8 @@ const union AnimCmd *const gFieldEffectAnimTable_Bubbles[] = { const struct SpriteTemplate gFieldEffectSpriteTemplate_Bubbles = {0xFFFF, 0x1004, &gFieldOamData_16x32, gFieldEffectAnimTable_Bubbles, gFieldEffectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; const struct SpriteFrameImage gFieldEffectPicTable_Sparkle[] = { - obj_frame_tiles(gFieldEffectPic_Sparkle_0), - obj_frame_tiles(gFieldEffectPic_Sparkle_1) + overworld_frame(gFieldEffectPic_Sparkle, 2, 2, 0), + overworld_frame(gFieldEffectPic_Sparkle, 2, 2, 1) }; const union AnimCmd gFieldEffectAnim_83751D8[] = { diff --git a/src/data/pokedex_orders.h b/src/data/pokedex_orders.h index 736c0df6a..830f3d70a 100644 --- a/src/data/pokedex_orders.h +++ b/src/data/pokedex_orders.h @@ -1,1609 +1,1609 @@ #if ENGLISH static const u16 gPokedexOrder_Alphabetical[] = { - 387, - 388, - 389, - 390, - 391, - 392, - 393, - 394, - 395, - 396, - 397, - 398, - 399, - 400, - 401, - 402, - 403, - 404, - 405, - 406, - 407, - 408, - 409, - 410, - 411, - 63, // Abra - 359, // Absol - 142, // Aerodactyl - 306, // Aggron - 190, // Aipom - 65, // Alakazam - 334, // Altaria - 181, // Ampharos - 347, // Anorith - 24, // Arbok - 59, // Arcanine - 168, // Ariados - 348, // Armaldo - 304, // Aron - 144, // Articuno - 184, // Azumarill - 298, // Azurill - 371, // Bagon - 343, // Baltoy - 354, // Banette - 339, // Barboach - 153, // Bayleef - 267, // Beautifly - 15, // Beedrill - 374, // Beldum - 182, // Bellossom - 69, // Bellsprout - 9, // Blastoise - 257, // Blaziken - 242, // Blissey - 286, // Breloom - 1, // Bulbasaur - 12, // Butterfree - 331, // Cacnea - 332, // Cacturne - 323, // Camerupt - 318, // Carvanha - 268, // Cascoon - 351, // Castform - 10, // Caterpie - 251, // Celebi - 113, // Chansey - 6, // Charizard - 4, // Charmander - 5, // Charmeleon - 152, // Chikorita - 358, // Chimecho - 170, // Chinchou - 366, // Clamperl - 344, // Claydol - 36, // Clefable - 35, // Clefairy - 173, // Cleffa - 91, // Cloyster - 256, // Combusken - 341, // Corphish - 222, // Corsola - 346, // Cradily - 342, // Crawdaunt - 169, // Crobat - 159, // Croconaw - 104, // Cubone - 155, // Cyndaquil - 301, // Delcatty - 225, // Delibird - 386, // Deoxys - 87, // Dewgong - 50, // Diglett - 132, // Ditto - 85, // Dodrio - 84, // Doduo - 232, // Donphan - 148, // Dragonair - 149, // Dragonite - 147, // Dratini - 96, // Drowzee - 51, // Dugtrio - 206, // Dunsparce - 356, // Dusclops - 355, // Duskull - 269, // Dustox - 133, // Eevee - 23, // Ekans - 125, // Electabuzz - 309, // Electrike - 101, // Electrode - 239, // Elekid - 244, // Entei - 196, // Espeon - 102, // Exeggcute - 103, // Exeggutor - 295, // Exploud - 83, // Farfetch'd - 22, // Fearow - 349, // Feebas - 160, // Feraligatr - 180, // Flaaffy - 136, // Flareon - 330, // Flygon - 205, // Forretress - 162, // Furret - 282, // Gardevoir - 92, // Gastly - 94, // Gengar - 74, // Geodude - 203, // Girafarig - 362, // Glalie - 207, // Gligar - 44, // Gloom - 42, // Golbat - 118, // Goldeen - 55, // Golduck - 76, // Golem - 368, // Gorebyss - 210, // Granbull - 75, // Graveler - 88, // Grimer - 383, // Groudon - 253, // Grovyle - 58, // Growlithe - 326, // Grumpig - 316, // Gulpin - 130, // Gyarados - 297, // Hariyama - 93, // Haunter - 214, // Heracross - 107, // Hitmonchan - 106, // Hitmonlee - 237, // Hitmontop - 250, // Ho-Oh - 163, // Hoothoot - 187, // Hoppip - 116, // Horsea - 229, // Houndoom - 228, // Houndour - 367, // Huntail - 97, // Hypno - 174, // Igglybuff - 314, // Illumise - 2, // Ivysaur - 39, // Jigglypuff - 385, // Jirachi - 135, // Jolteon - 189, // Jumpluff - 124, // Jynx - 140, // Kabuto - 141, // Kabutops - 64, // Kadabra - 14, // Kakuna - 115, // Kangaskhan - 352, // Kecleon - 230, // Kingdra - 99, // Kingler - 281, // Kirlia - 109, // Koffing - 98, // Krabby - 382, // Kyogre - 305, // Lairon - 171, // Lanturn - 131, // Lapras - 246, // Larvitar - 380, // Latias - 381, // Latios - 166, // Ledian - 165, // Ledyba - 108, // Lickitung - 345, // Lileep - 264, // Linoone - 271, // Lombre - 270, // Lotad - 294, // Loudred - 272, // Ludicolo - 249, // Lugia - 337, // Lunatone - 370, // Luvdisc - 68, // Machamp - 67, // Machoke - 66, // Machop - 240, // Magby - 219, // Magcargo - 129, // Magikarp - 126, // Magmar - 81, // Magnemite - 82, // Magneton - 296, // Makuhita - 310, // Manectric - 56, // Mankey - 226, // Mantine - 179, // Mareep - 183, // Marill - 105, // Marowak - 259, // Marshtomp - 284, // Masquerain - 303, // Mawile - 308, // Medicham - 307, // Meditite - 154, // Meganium - 52, // Meowth - 376, // Metagross - 375, // Metang - 11, // Metapod - 151, // Mew - 150, // Mewtwo - 262, // Mightyena - 350, // Milotic - 241, // Miltank - 312, // Minun - 200, // Misdreavus - 146, // Moltres - 122, // Mr. mime - 258, // Mudkip - 89, // Muk - 198, // Murkrow - 177, // Natu - 34, // Nidoking - 31, // Nidoqueen - 29, // Nidoran? - 32, // Nidoran? - 30, // Nidorina - 33, // Nidorino - 290, // Nincada - 38, // Ninetales - 291, // Ninjask - 164, // Noctowl - 299, // Nosepass - 322, // Numel - 274, // Nuzleaf - 224, // Octillery - 43, // Oddish - 138, // Omanyte - 139, // Omastar - 95, // Onix - 46, // Paras - 47, // Parasect - 279, // Pelipper - 53, // Persian - 231, // Phanpy - 172, // Pichu - 18, // Pidgeot - 17, // Pidgeotto - 16, // Pidgey - 25, // Pikachu - 221, // Piloswine - 204, // Pineco - 127, // Pinsir - 311, // Plusle - 186, // Politoed - 60, // Poliwag - 61, // Poliwhirl - 62, // Poliwrath - 77, // Ponyta - 261, // Poochyena - 137, // Porygon - 233, // Porygon2 - 57, // Primeape - 54, // Psyduck - 247, // Pupitar - 195, // Quagsire - 156, // Quilava - 211, // Qwilfish - 26, // Raichu - 243, // Raikou - 280, // Ralts - 78, // Rapidash - 20, // Raticate - 19, // Rattata - 384, // Rayquaza - 378, // Regice - 377, // Regirock - 379, // Registeel - 369, // Relicanth - 223, // Remoraid - 112, // Rhydon - 111, // Rhyhorn - 315, // Roselia - 302, // Sableye - 373, // Salamence - 27, // Sandshrew - 28, // Sandslash - 254, // Sceptile - 212, // Scizor - 123, // Scyther - 117, // Seadra - 119, // Seaking - 364, // Sealeo - 273, // Seedot - 86, // Seel - 161, // Sentret - 336, // Seviper - 319, // Sharpedo - 292, // Shedinja - 372, // Shelgon - 90, // Shellder - 275, // Shiftry - 285, // Shroomish - 213, // Shuckle - 353, // Shuppet - 266, // Silcoon - 227, // Skarmory - 188, // Skiploom - 300, // Skitty - 289, // Slaking - 287, // Slakoth - 80, // Slowbro - 199, // Slowking - 79, // Slowpoke - 218, // Slugma - 235, // Smeargle - 238, // Smoochum - 215, // Sneasel - 143, // Snorlax - 361, // Snorunt - 209, // Snubbull - 338, // Solrock - 21, // Spearow - 363, // Spheal - 167, // Spinarak - 327, // Spinda - 325, // Spoink - 7, // Squirtle - 234, // Stantler - 121, // Starmie - 120, // Staryu - 208, // Steelix - 185, // Sudowoodo - 245, // Suicune - 192, // Sunflora - 191, // Sunkern - 283, // Surskit - 333, // Swablu - 317, // Swalot - 260, // Swampert - 277, // Swellow - 220, // Swinub - 276, // Taillow - 114, // Tangela - 128, // Tauros - 216, // Teddiursa - 72, // Tentacool - 73, // Tentacruel - 175, // Togepi - 176, // Togetic - 255, // Torchic - 324, // Torkoal - 158, // Totodile - 328, // Trapinch - 252, // Treecko - 357, // Tropius - 157, // Typhlosion - 248, // Tyranitar - 236, // Tyrogue - 197, // Umbreon - 201, // Unown - 217, // Ursaring - 134, // Vaporeon - 49, // Venomoth - 48, // Venonat - 3, // Venusaur - 329, // Vibrava - 71, // Victreebel - 288, // Vigoroth - 45, // Vileplume - 313, // Volbeat - 100, // Voltorb - 37, // Vulpix - 320, // Wailmer - 321, // Wailord - 365, // Walrein - 8, // Wartortle - 13, // Weedle - 70, // Weepinbell - 110, // Weezing - 340, // Whiscash - 293, // Whismur - 40, // Wigglytuff - 278, // Wingull - 202, // Wobbuffet - 194, // Wooper - 265, // Wurmple - 360, // Wynaut - 178, // Xatu - 193, // Yanma - 335, // Zangoose - 145, // Zapdos - 263, // Zigzagoon - 41, // Zubat + NATIONAL_DEX_OLD_UNOWN_B, + NATIONAL_DEX_OLD_UNOWN_C, + NATIONAL_DEX_OLD_UNOWN_D, + NATIONAL_DEX_OLD_UNOWN_E, + NATIONAL_DEX_OLD_UNOWN_F, + NATIONAL_DEX_OLD_UNOWN_G, + NATIONAL_DEX_OLD_UNOWN_H, + NATIONAL_DEX_OLD_UNOWN_I, + NATIONAL_DEX_OLD_UNOWN_J, + NATIONAL_DEX_OLD_UNOWN_K, + NATIONAL_DEX_OLD_UNOWN_L, + NATIONAL_DEX_OLD_UNOWN_M, + NATIONAL_DEX_OLD_UNOWN_N, + NATIONAL_DEX_OLD_UNOWN_O, + NATIONAL_DEX_OLD_UNOWN_P, + NATIONAL_DEX_OLD_UNOWN_Q, + NATIONAL_DEX_OLD_UNOWN_R, + NATIONAL_DEX_OLD_UNOWN_S, + NATIONAL_DEX_OLD_UNOWN_T, + NATIONAL_DEX_OLD_UNOWN_U, + NATIONAL_DEX_OLD_UNOWN_V, + NATIONAL_DEX_OLD_UNOWN_W, + NATIONAL_DEX_OLD_UNOWN_X, + NATIONAL_DEX_OLD_UNOWN_Y, + NATIONAL_DEX_OLD_UNOWN_Z, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_ARON, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_GROUDON, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_METANG, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_MEW, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_MUK, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_NATU, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_WAILORD, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_XATU, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_ZUBAT, }; #elif GERMAN static const u16 gPokedexOrder_Alphabetical[] = { - 387, - 388, - 389, - 390, - 391, - 392, - 393, - 394, - 395, - 396, - 397, - 398, - 399, - 400, - 401, - 402, - 403, - 404, - 405, - 406, - 407, - 408, - 409, - 410, - 411, - 367, // Aalabyss - 63, // Abra - 359, // Absol - 142, // Aerodactyl - 93, // Alpollo - 334, // Altaria - 138, // Amonitas - 139, // Amoroso - 181, // Ampharos - 347, // Anorith - 134, // Aquana - 24, // Arbok - 168, // Ariados - 59, // Arkani - 144, // Arktos - 348, // Armaldo - 91, // Austos - 184, // Azumarill - 298, // Azurill - 211, // Baldorfish - 354, // Banette - 349, // Barschwa - 15, // Bibor - 3, // Bisaflor - 2, // Bisaknosp - 1, // Bisasam - 274, // Blanas - 135, // Blitza - 182, // Blubella - 48, // Bluzuk - 225, // Botogel - 373, // Brutalanda - 287, // Bummelz - 322, // Camaub - 323, // Camerupt - 251, // Celebi - 113, // Chaneira - 222, // Corasonn - 234, // Damhirplex - 386, // Deoxys - 248, // Despotar - 50, // Digda - 51, // Digdri - 132, // Ditto - 85, // Dodri - 84, // Dodu - 232, // Donphan - 148, // Dragonir - 149, // Dragoran - 372, // Draschel - 147, // Dratini - 44, // Duflor - 206, // Dummisel - 239, // Elekid - 125, // Elektek - 152, // Endivie - 300, // Eneco - 301, // Enekoro - 244, // Entei - 54, // Enton - 55, // Entoron - 133, // Evoli - 235, // Farbeagle - 194, // Felino - 155, // Feurigel - 261, // Fiffyen - 362, // Firnontor - 136, // Flamara - 79, // Flegmon - 255, // Flemmli - 174, // Fluffeluff - 303, // Flunkifer - 293, // Flurmel - 351, // Formeo - 205, // Forstellka - 309, // Frizelbliz - 58, // Fukano - 78, // Gallopa - 130, // Garados - 252, // Geckarbor - 283, // Gehweiher - 94, // Gengar - 75, // Georok - 76, // Geowaz - 264, // Geradaks - 254, // Gewaldro - 45, // Giflor - 203, // Girafarig - 4, // Glumanda - 6, // Glurak - 5, // Glutexo - 42, // Golbat - 118, // Goldini - 119, // Golking - 210, // Granbull - 190, // Griffel - 326, // Groink - 383, // Groudon - 282, // Guardevoir - 21, // Habitak - 297, // Hariyama - 242, // Heiteira - 250, // Ho-oh - 163, // Hoothoot - 187, // Hoppspross - 13, // Hornliu - 188, // Hubelupf - 229, // Hundemon - 228, // Hunduster - 258, // Hydropi - 97, // Hypno - 22, // Ibitak - 201, // Icognito - 156, // Igelavar - 169, // Iksbat - 314, // Illumise - 160, // Impergator - 360, // Isso - 385, // Jirachi - 87, // Jugong - 256, // Jungglut - 86, // Jurob - 140, // Kabuto - 141, // Kabutops - 64, // Kadabra - 115, // Kangama - 318, // Kanivanha - 286, // Kapilz - 237, // Kapoera - 272, // Kappalores - 158, // Karnimani - 129, // Karpador - 352, // Kecleon - 221, // Keifel - 106, // Kicklee - 371, // Kindwurm - 99, // Kingler - 281, // Kirlia - 74, // Kleinstein - 328, // Knacklion - 285, // Knilz - 69, // Knofensa - 105, // Knogga - 40, // Knuddeluff - 103, // Kokowei - 14, // Kokuna - 98, // Krabby - 294, // Krakeelo - 198, // Kramurx - 295, // Krawumms - 341, // Krebscorps - 342, // Krebutack - 238, // Kussilla - 382, // Kyogre - 80, // Lahmus - 170, // Lampi - 171, // Lanturn - 131, // Lapras - 246, // Larvitar - 199, // Laschoking - 380, // Latias - 381, // Latios - 146, // Lavados - 166, // Ledian - 165, // Ledyba - 101, // Lektrobal - 344, // Lepumentas - 289, // Letarking - 330, // Libelldra - 370, // Liebiskus - 345, // Liliep - 257, // Lohgock - 271, // Lombrero - 153, // Lorblatt - 270, // Loturzel - 249, // Lugia - 337, // Lunastein - 66, // Machollo - 68, // Machomei - 240, // Magby - 219, // Magcargo - 126, // Magmar - 262, // Magnayen - 81, // Magnetilo - 82, // Magneton - 296, // Makuhita - 226, // Mantax - 183, // Marill - 67, // Maschock - 284, // Maskeregen - 52, // Mauzi - 308, // Meditalis - 307, // Meditie - 154, // Meganie - 56, // Menki - 376, // Metagross - 375, // Metang - 151, // Mew - 150, // Mewtu - 350, // Milotic - 241, // Miltank - 312, // Minun - 185, // Mogelbaum - 259, // Moorabbel - 195, // Morlord - 288, // Muntier - 90, // Muschas - 43, // Myrapla - 197, // Nachtara - 299, // Nasgnet - 177, // Natu - 92, // Nebulak - 34, // Nidoking - 31, // Nidoqueen - 29, // Nidoran♀ - 32, // Nidoran♂ - 30, // Nidorina - 33, // Nidorino - 290, // Nincada - 291, // Ninjask - 292, // Ninjatom - 107, // Nockchan - 164, // Noctuh - 332, // Noktuska - 224, // Octillery - 49, // Omot - 95, // Onix - 102, // Owei - 358, // Palimpalim - 327, // Pandir - 268, // Panekon - 122, // Pantimos - 227, // Panzaeron - 267, // Papinella - 189, // Papungha - 46, // Paras - 47, // Parasek - 279, // Pelipper - 366, // Perlu - 231, // Phanpy - 172, // Pichu - 35, // Piepi - 173, // Pii - 25, // Pikachu - 127, // Pinsir - 36, // Pixi - 311, // Plusle - 77, // Ponita - 83, // Porenta - 137, // Porygon - 233, // Porygon2 - 213, // Pottrott - 196, // Psiana - 269, // Pudox - 39, // Pummeluff - 247, // Pupitar - 343, // Puppance - 62, // Quappo - 60, // Quapsel - 61, // Quaputzi - 186, // Quaxo - 220, // Quiekel - 324, // Qurtel - 236, // Rabauz - 26, // Raichu - 243, // Raikou - 57, // Rasaff - 19, // Rattfratz - 20, // Rattikarl - 10, // Raupy - 384, // Rayquaza - 378, // Regice - 377, // Regirock - 379, // Registeel - 143, // Relaxo - 369, // Relicanth - 223, // Remoraid - 253, // Reptain - 23, // Rettan - 111, // Rihorn - 112, // Rizeros - 315, // Roselia - 124, // Rossana - 11, // Safcon - 368, // Saganabyss - 273, // Samurzel - 28, // Sandamer - 27, // Sandan - 71, // Sarzenia - 266, // Schaloko - 212, // Scherox - 7, // Schiggy - 8, // Schillok - 317, // Schlukwech - 316, // Schluppuck - 108, // Schlurp - 339, // Schmerbe - 218, // Schneckmag - 361, // Schneppke - 276, // Schwalbini - 277, // Schwalboss - 230, // Seedraking - 364, // Seejong - 117, // Seemon - 363, // Seemops - 116, // Seeper - 335, // Sengo - 353, // Shuppet - 123, // Sichlor - 65, // Simsala - 214, // Skaraborn - 207, // Skorgla - 88, // Sleima - 89, // Sleimok - 12, // Smettbo - 110, // Smogmog - 109, // Smogon - 215, // Sniebel - 53, // Snobilikat - 209, // Snubbull - 338, // Sonnfel - 192, // Sonnflora - 191, // Sonnkern - 325, // Spoink - 208, // Stahlos - 121, // Starmie - 120, // Sterndu - 306, // Stolloss - 305, // Stollrak - 304, // Stollunior - 245, // Suicune - 260, // Sumpex - 114, // Tangela - 374, // Tanhel - 204, // Tannza - 17, // Tauboga - 18, // Tauboss - 16, // Taubsi - 128, // Tauros - 216, // Teddiursa - 275, // Tengulist - 72, // Tentacha - 73, // Tentoxa - 175, // Togepi - 176, // Togetic - 319, // Tohaido - 157, // Tornupto - 104, // Tragosso - 280, // Trasla - 96, // Traumato - 200, // Traunfugil - 357, // Tropius - 9, // Turtok - 331, // Tuska - 159, // Tyracroc - 70, // Ultrigaria - 217, // Ursaring - 329, // Vibrava - 336, // Vipitis - 313, // Volbeat - 310, // Voltenso - 179, // Voltilamm - 100, // Voltobal - 38, // Vulnona - 37, // Vulpix - 180, // Waaty - 333, // Wablu - 320, // Wailmer - 321, // Wailord - 365, // Walraisa - 265, // Waumpel - 167, // Webarak - 340, // Welsar - 346, // Wielie - 162, // Wiesenior - 161, // Wiesor - 278, // Wingull - 202, // Woingenau - 178, // Xatu - 193, // Yanma - 145, // Zapdos - 263, // Zigzachs - 302, // Zobiris - 41, // Zubat - 356, // Zwirrklop - 355, // Zwirrlicht + NATIONAL_DEX_OLD_UNOWN_B, + NATIONAL_DEX_OLD_UNOWN_C, + NATIONAL_DEX_OLD_UNOWN_D, + NATIONAL_DEX_OLD_UNOWN_E, + NATIONAL_DEX_OLD_UNOWN_F, + NATIONAL_DEX_OLD_UNOWN_G, + NATIONAL_DEX_OLD_UNOWN_H, + NATIONAL_DEX_OLD_UNOWN_I, + NATIONAL_DEX_OLD_UNOWN_J, + NATIONAL_DEX_OLD_UNOWN_K, + NATIONAL_DEX_OLD_UNOWN_L, + NATIONAL_DEX_OLD_UNOWN_M, + NATIONAL_DEX_OLD_UNOWN_N, + NATIONAL_DEX_OLD_UNOWN_O, + NATIONAL_DEX_OLD_UNOWN_P, + NATIONAL_DEX_OLD_UNOWN_Q, + NATIONAL_DEX_OLD_UNOWN_R, + NATIONAL_DEX_OLD_UNOWN_S, + NATIONAL_DEX_OLD_UNOWN_T, + NATIONAL_DEX_OLD_UNOWN_U, + NATIONAL_DEX_OLD_UNOWN_V, + NATIONAL_DEX_OLD_UNOWN_W, + NATIONAL_DEX_OLD_UNOWN_X, + NATIONAL_DEX_OLD_UNOWN_Y, + NATIONAL_DEX_OLD_UNOWN_Z, + NATIONAL_DEX_HUNTAIL, // Aalabyss + NATIONAL_DEX_ABRA, // Abra + NATIONAL_DEX_ABSOL, // Absol + NATIONAL_DEX_AERODACTYL, // Aerodactyl + NATIONAL_DEX_HAUNTER, // Alpollo + NATIONAL_DEX_ALTARIA, // Altaria + NATIONAL_DEX_OMANYTE, // Amonitas + NATIONAL_DEX_OMASTAR, // Amoroso + NATIONAL_DEX_AMPHAROS, // Ampharos + NATIONAL_DEX_ANORITH, // Anorith + NATIONAL_DEX_VAPOREON, // Aquana + NATIONAL_DEX_ARBOK, // Arbok + NATIONAL_DEX_ARIADOS, // Ariados + NATIONAL_DEX_ARCANINE, // Arkani + NATIONAL_DEX_ARTICUNO, // Arktos + NATIONAL_DEX_ARMALDO, // Armaldo + NATIONAL_DEX_CLOYSTER, // Austos + NATIONAL_DEX_AZUMARILL, // Azumarill + NATIONAL_DEX_AZURILL, // Azurill + NATIONAL_DEX_QWILFISH, // Baldorfish + NATIONAL_DEX_BANETTE, // Banette + NATIONAL_DEX_FEEBAS, // Barschwa + NATIONAL_DEX_BEEDRILL, // Bibor + NATIONAL_DEX_VENUSAUR, // Bisaflor + NATIONAL_DEX_IVYSAUR, // Bisaknosp + NATIONAL_DEX_BULBASAUR, // Bisasam + NATIONAL_DEX_NUZLEAF, // Blanas + NATIONAL_DEX_JOLTEON, // Blitza + NATIONAL_DEX_BELLOSSOM, // Blubella + NATIONAL_DEX_VENONAT, // Bluzuk + NATIONAL_DEX_DELIBIRD, // Botogel + NATIONAL_DEX_SALAMENCE, // Brutalanda + NATIONAL_DEX_SLAKOTH, // Bummelz + NATIONAL_DEX_NUMEL, // Camaub + NATIONAL_DEX_CAMERUPT, // Camerupt + NATIONAL_DEX_CELEBI, // Celebi + NATIONAL_DEX_CHANSEY, // Chaneira + NATIONAL_DEX_CORSOLA, // Corasonn + NATIONAL_DEX_STANTLER, // Damhirplex + NATIONAL_DEX_DEOXYS, // Deoxys + NATIONAL_DEX_TYRANITAR, // Despotar + NATIONAL_DEX_DIGLETT, // Digda + NATIONAL_DEX_DUGTRIO, // Digdri + NATIONAL_DEX_DITTO, // Ditto + NATIONAL_DEX_DODRIO, // Dodri + NATIONAL_DEX_DODUO, // Dodu + NATIONAL_DEX_DONPHAN, // Donphan + NATIONAL_DEX_DRAGONAIR, // Dragonir + NATIONAL_DEX_DRAGONITE, // Dragoran + NATIONAL_DEX_SHELGON, // Draschel + NATIONAL_DEX_DRATINI, // Dratini + NATIONAL_DEX_GLOOM, // Duflor + NATIONAL_DEX_DUNSPARCE, // Dummisel + NATIONAL_DEX_ELEKID, // Elekid + NATIONAL_DEX_ELECTABUZZ, // Elektek + NATIONAL_DEX_CHIKORITA, // Endivie + NATIONAL_DEX_SKITTY, // Eneco + NATIONAL_DEX_DELCATTY, // Enekoro + NATIONAL_DEX_ENTEI, // Entei + NATIONAL_DEX_PSYDUCK, // Enton + NATIONAL_DEX_GOLDUCK, // Entoron + NATIONAL_DEX_EEVEE, // Evoli + NATIONAL_DEX_SMEARGLE, // Farbeagle + NATIONAL_DEX_WOOPER, // Felino + NATIONAL_DEX_CYNDAQUIL, // Feurigel + NATIONAL_DEX_POOCHYENA, // Fiffyen + NATIONAL_DEX_GLALIE, // Firnontor + NATIONAL_DEX_FLAREON, // Flamara + NATIONAL_DEX_SLOWPOKE, // Flegmon + NATIONAL_DEX_TORCHIC, // Flemmli + NATIONAL_DEX_IGGLYBUFF, // Fluffeluff + NATIONAL_DEX_MAWILE, // Flunkifer + NATIONAL_DEX_WHISMUR, // Flurmel + NATIONAL_DEX_CASTFORM, // Formeo + NATIONAL_DEX_FORRETRESS, // Forstellka + NATIONAL_DEX_ELECTRIKE, // Frizelbliz + NATIONAL_DEX_GROWLITHE, // Fukano + NATIONAL_DEX_RAPIDASH, // Gallopa + NATIONAL_DEX_GYARADOS, // Garados + NATIONAL_DEX_TREECKO, // Geckarbor + NATIONAL_DEX_SURSKIT, // Gehweiher + NATIONAL_DEX_GENGAR, // Gengar + NATIONAL_DEX_GRAVELER, // Georok + NATIONAL_DEX_GOLEM, // Geowaz + NATIONAL_DEX_LINOONE, // Geradaks + NATIONAL_DEX_SCEPTILE, // Gewaldro + NATIONAL_DEX_VILEPLUME, // Giflor + NATIONAL_DEX_GIRAFARIG, // Girafarig + NATIONAL_DEX_CHARMANDER, // Glumanda + NATIONAL_DEX_CHARIZARD, // Glurak + NATIONAL_DEX_CHARMELEON, // Glutexo + NATIONAL_DEX_GOLBAT, // Golbat + NATIONAL_DEX_GOLDEEN, // Goldini + NATIONAL_DEX_SEAKING, // Golking + NATIONAL_DEX_GRANBULL, // Granbull + NATIONAL_DEX_AIPOM, // Griffel + NATIONAL_DEX_GRUMPIG, // Groink + NATIONAL_DEX_GROUDON, // Groudon + NATIONAL_DEX_GARDEVOIR, // Guardevoir + NATIONAL_DEX_SPEAROW, // Habitak + NATIONAL_DEX_HARIYAMA, // Hariyama + NATIONAL_DEX_BLISSEY, // Heiteira + NATIONAL_DEX_HO_OH, // Ho-oh + NATIONAL_DEX_HOOTHOOT, // Hoothoot + NATIONAL_DEX_HOPPIP, // Hoppspross + NATIONAL_DEX_WEEDLE, // Hornliu + NATIONAL_DEX_SKIPLOOM, // Hubelupf + NATIONAL_DEX_HOUNDOOM, // Hundemon + NATIONAL_DEX_HOUNDOUR, // Hunduster + NATIONAL_DEX_MUDKIP, // Hydropi + NATIONAL_DEX_HYPNO, // Hypno + NATIONAL_DEX_FEAROW, // Ibitak + NATIONAL_DEX_UNOWN, // Icognito + NATIONAL_DEX_QUILAVA, // Igelavar + NATIONAL_DEX_CROBAT, // Iksbat + NATIONAL_DEX_ILLUMISE, // Illumise + NATIONAL_DEX_FERALIGATR, // Impergator + NATIONAL_DEX_WYNAUT, // Isso + NATIONAL_DEX_JIRACHI, // Jirachi + NATIONAL_DEX_DEWGONG, // Jugong + NATIONAL_DEX_COMBUSKEN, // Jungglut + NATIONAL_DEX_SEEL, // Jurob + NATIONAL_DEX_KABUTO, // Kabuto + NATIONAL_DEX_KABUTOPS, // Kabutops + NATIONAL_DEX_KADABRA, // Kadabra + NATIONAL_DEX_KANGASKHAN, // Kangama + NATIONAL_DEX_CARVANHA, // Kanivanha + NATIONAL_DEX_BRELOOM, // Kapilz + NATIONAL_DEX_HITMONTOP, // Kapoera + NATIONAL_DEX_LUDICOLO, // Kappalores + NATIONAL_DEX_TOTODILE, // Karnimani + NATIONAL_DEX_MAGIKARP, // Karpador + NATIONAL_DEX_KECLEON, // Kecleon + NATIONAL_DEX_PILOSWINE, // Keifel + NATIONAL_DEX_HITMONLEE, // Kicklee + NATIONAL_DEX_BAGON, // Kindwurm + NATIONAL_DEX_KINGLER, // Kingler + NATIONAL_DEX_KIRLIA, // Kirlia + NATIONAL_DEX_GEODUDE, // Kleinstein + NATIONAL_DEX_TRAPINCH, // Knacklion + NATIONAL_DEX_SHROOMISH, // Knilz + NATIONAL_DEX_BELLSPROUT, // Knofensa + NATIONAL_DEX_MAROWAK, // Knogga + NATIONAL_DEX_WIGGLYTUFF, // Knuddeluff + NATIONAL_DEX_EXEGGUTOR, // Kokowei + NATIONAL_DEX_KAKUNA, // Kokuna + NATIONAL_DEX_KRABBY, // Krabby + NATIONAL_DEX_LOUDRED, // Krakeelo + NATIONAL_DEX_MURKROW, // Kramurx + NATIONAL_DEX_EXPLOUD, // Krawumms + NATIONAL_DEX_CORPHISH, // Krebscorps + NATIONAL_DEX_CRAWDAUNT, // Krebutack + NATIONAL_DEX_SMOOCHUM, // Kussilla + NATIONAL_DEX_KYOGRE, // Kyogre + NATIONAL_DEX_SLOWBRO, // Lahmus + NATIONAL_DEX_CHINCHOU, // Lampi + NATIONAL_DEX_LANTURN, // Lanturn + NATIONAL_DEX_LAPRAS, // Lapras + NATIONAL_DEX_LARVITAR, // Larvitar + NATIONAL_DEX_SLOWKING, // Laschoking + NATIONAL_DEX_LATIAS, // Latias + NATIONAL_DEX_LATIOS, // Latios + NATIONAL_DEX_MOLTRES, // Lavados + NATIONAL_DEX_LEDIAN, // Ledian + NATIONAL_DEX_LEDYBA, // Ledyba + NATIONAL_DEX_ELECTRODE, // Lektrobal + NATIONAL_DEX_CLAYDOL, // Lepumentas + NATIONAL_DEX_SLAKING, // Letarking + NATIONAL_DEX_FLYGON, // Libelldra + NATIONAL_DEX_LUVDISC, // Liebiskus + NATIONAL_DEX_LILEEP, // Liliep + NATIONAL_DEX_BLAZIKEN, // Lohgock + NATIONAL_DEX_LOMBRE, // Lombrero + NATIONAL_DEX_BAYLEEF, // Lorblatt + NATIONAL_DEX_LOTAD, // Loturzel + NATIONAL_DEX_LUGIA, // Lugia + NATIONAL_DEX_LUNATONE, // Lunastein + NATIONAL_DEX_MACHOP, // Machollo + NATIONAL_DEX_MACHAMP, // Machomei + NATIONAL_DEX_MAGBY, // Magby + NATIONAL_DEX_MAGCARGO, // Magcargo + NATIONAL_DEX_MAGMAR, // Magmar + NATIONAL_DEX_MIGHTYENA, // Magnayen + NATIONAL_DEX_MAGNEMITE, // Magnetilo + NATIONAL_DEX_MAGNETON, // Magneton + NATIONAL_DEX_MAKUHITA, // Makuhita + NATIONAL_DEX_MANTINE, // Mantax + NATIONAL_DEX_MARILL, // Marill + NATIONAL_DEX_MACHOKE, // Maschock + NATIONAL_DEX_MASQUERAIN, // Maskeregen + NATIONAL_DEX_MEOWTH, // Mauzi + NATIONAL_DEX_MEDICHAM, // Meditalis + NATIONAL_DEX_MEDITITE, // Meditie + NATIONAL_DEX_MEGANIUM, // Meganie + NATIONAL_DEX_MANKEY, // Menki + NATIONAL_DEX_METAGROSS, // Metagross + NATIONAL_DEX_METANG, // Metang + NATIONAL_DEX_MEW, // Mew + NATIONAL_DEX_MEWTWO, // Mewtu + NATIONAL_DEX_MILOTIC, // Milotic + NATIONAL_DEX_MILTANK, // Miltank + NATIONAL_DEX_MINUN, // Minun + NATIONAL_DEX_SUDOWOODO, // Mogelbaum + NATIONAL_DEX_MARSHTOMP, // Moorabbel + NATIONAL_DEX_QUAGSIRE, // Morlord + NATIONAL_DEX_VIGOROTH, // Muntier + NATIONAL_DEX_SHELLDER, // Muschas + NATIONAL_DEX_ODDISH, // Myrapla + NATIONAL_DEX_UMBREON, // Nachtara + NATIONAL_DEX_NOSEPASS, // Nasgnet + NATIONAL_DEX_NATU, // Natu + NATIONAL_DEX_GASTLY, // Nebulak + NATIONAL_DEX_NIDOKING, // Nidoking + NATIONAL_DEX_NIDOQUEEN, // Nidoqueen + NATIONAL_DEX_NIDORAN_F, // Nidoran♀ + NATIONAL_DEX_NIDORAN_M, // Nidoran♂ + NATIONAL_DEX_NIDORINA, // Nidorina + NATIONAL_DEX_NIDORINO, // Nidorino + NATIONAL_DEX_NINCADA, // Nincada + NATIONAL_DEX_NINJASK, // Ninjask + NATIONAL_DEX_SHEDINJA, // Ninjatom + NATIONAL_DEX_HITMONCHAN, // Nockchan + NATIONAL_DEX_NOCTOWL, // Noctuh + NATIONAL_DEX_CACTURNE, // Noktuska + NATIONAL_DEX_OCTILLERY, // Octillery + NATIONAL_DEX_VENOMOTH, // Omot + NATIONAL_DEX_ONIX, // Onix + NATIONAL_DEX_EXEGGCUTE, // Owei + NATIONAL_DEX_CHIMECHO, // Palimpalim + NATIONAL_DEX_SPINDA, // Pandir + NATIONAL_DEX_CASCOON, // Panekon + NATIONAL_DEX_MR_MIME, // Pantimos + NATIONAL_DEX_SKARMORY, // Panzaeron + NATIONAL_DEX_BEAUTIFLY, // Papinella + NATIONAL_DEX_JUMPLUFF, // Papungha + NATIONAL_DEX_PARAS, // Paras + NATIONAL_DEX_PARASECT, // Parasek + NATIONAL_DEX_PELIPPER, // Pelipper + NATIONAL_DEX_CLAMPERL, // Perlu + NATIONAL_DEX_PHANPY, // Phanpy + NATIONAL_DEX_PICHU, // Pichu + NATIONAL_DEX_CLEFAIRY, // Piepi + NATIONAL_DEX_CLEFFA, // Pii + NATIONAL_DEX_PIKACHU, // Pikachu + NATIONAL_DEX_PINSIR, // Pinsir + NATIONAL_DEX_CLEFABLE, // Pixi + NATIONAL_DEX_PLUSLE, // Plusle + NATIONAL_DEX_PONYTA, // Ponita + NATIONAL_DEX_FARFETCHD, // Porenta + NATIONAL_DEX_PORYGON, // Porygon + NATIONAL_DEX_PORYGON2, // Porygon2 + NATIONAL_DEX_SHUCKLE, // Pottrott + NATIONAL_DEX_ESPEON, // Psiana + NATIONAL_DEX_DUSTOX, // Pudox + NATIONAL_DEX_JIGGLYPUFF, // Pummeluff + NATIONAL_DEX_PUPITAR, // Pupitar + NATIONAL_DEX_BALTOY, // Puppance + NATIONAL_DEX_POLIWRATH, // Quappo + NATIONAL_DEX_POLIWAG, // Quapsel + NATIONAL_DEX_POLIWHIRL, // Quaputzi + NATIONAL_DEX_POLITOED, // Quaxo + NATIONAL_DEX_SWINUB, // Quiekel + NATIONAL_DEX_TORKOAL, // Qurtel + NATIONAL_DEX_TYROGUE, // Rabauz + NATIONAL_DEX_RAICHU, // Raichu + NATIONAL_DEX_RAIKOU, // Raikou + NATIONAL_DEX_PRIMEAPE, // Rasaff + NATIONAL_DEX_RATTATA, // Rattfratz + NATIONAL_DEX_RATICATE, // Rattikarl + NATIONAL_DEX_CATERPIE, // Raupy + NATIONAL_DEX_RAYQUAZA, // Rayquaza + NATIONAL_DEX_REGICE, // Regice + NATIONAL_DEX_REGIROCK, // Regirock + NATIONAL_DEX_REGISTEEL, // Registeel + NATIONAL_DEX_SNORLAX, // Relaxo + NATIONAL_DEX_RELICANTH, // Relicanth + NATIONAL_DEX_REMORAID, // Remoraid + NATIONAL_DEX_GROVYLE, // Reptain + NATIONAL_DEX_EKANS, // Rettan + NATIONAL_DEX_RHYHORN, // Rihorn + NATIONAL_DEX_RHYDON, // Rizeros + NATIONAL_DEX_ROSELIA, // Roselia + NATIONAL_DEX_JYNX, // Rossana + NATIONAL_DEX_METAPOD, // Safcon + NATIONAL_DEX_GOREBYSS, // Saganabyss + NATIONAL_DEX_SEEDOT, // Samurzel + NATIONAL_DEX_SANDSLASH, // Sandamer + NATIONAL_DEX_SANDSHREW, // Sandan + NATIONAL_DEX_VICTREEBEL, // Sarzenia + NATIONAL_DEX_SILCOON, // Schaloko + NATIONAL_DEX_SCIZOR, // Scherox + NATIONAL_DEX_SQUIRTLE, // Schiggy + NATIONAL_DEX_WARTORTLE, // Schillok + NATIONAL_DEX_SWALOT, // Schlukwech + NATIONAL_DEX_GULPIN, // Schluppuck + NATIONAL_DEX_LICKITUNG, // Schlurp + NATIONAL_DEX_BARBOACH, // Schmerbe + NATIONAL_DEX_SLUGMA, // Schneckmag + NATIONAL_DEX_SNORUNT, // Schneppke + NATIONAL_DEX_TAILLOW, // Schwalbini + NATIONAL_DEX_SWELLOW, // Schwalboss + NATIONAL_DEX_KINGDRA, // Seedraking + NATIONAL_DEX_SEALEO, // Seejong + NATIONAL_DEX_SEADRA, // Seemon + NATIONAL_DEX_SPHEAL, // Seemops + NATIONAL_DEX_HORSEA, // Seeper + NATIONAL_DEX_ZANGOOSE, // Sengo + NATIONAL_DEX_SHUPPET, // Shuppet + NATIONAL_DEX_SCYTHER, // Sichlor + NATIONAL_DEX_ALAKAZAM, // Simsala + NATIONAL_DEX_HERACROSS, // Skaraborn + NATIONAL_DEX_GLIGAR, // Skorgla + NATIONAL_DEX_GRIMER, // Sleima + NATIONAL_DEX_MUK, // Sleimok + NATIONAL_DEX_BUTTERFREE, // Smettbo + NATIONAL_DEX_WEEZING, // Smogmog + NATIONAL_DEX_KOFFING, // Smogon + NATIONAL_DEX_SNEASEL, // Sniebel + NATIONAL_DEX_PERSIAN, // Snobilikat + NATIONAL_DEX_SNUBBULL, // Snubbull + NATIONAL_DEX_SOLROCK, // Sonnfel + NATIONAL_DEX_SUNFLORA, // Sonnflora + NATIONAL_DEX_SUNKERN, // Sonnkern + NATIONAL_DEX_SPOINK, // Spoink + NATIONAL_DEX_STEELIX, // Stahlos + NATIONAL_DEX_STARMIE, // Starmie + NATIONAL_DEX_STARYU, // Sterndu + NATIONAL_DEX_AGGRON, // Stolloss + NATIONAL_DEX_LAIRON, // Stollrak + NATIONAL_DEX_ARON, // Stollunior + NATIONAL_DEX_SUICUNE, // Suicune + NATIONAL_DEX_SWAMPERT, // Sumpex + NATIONAL_DEX_TANGELA, // Tangela + NATIONAL_DEX_BELDUM, // Tanhel + NATIONAL_DEX_PINECO, // Tannza + NATIONAL_DEX_PIDGEOTTO, // Tauboga + NATIONAL_DEX_PIDGEOT, // Tauboss + NATIONAL_DEX_PIDGEY, // Taubsi + NATIONAL_DEX_TAUROS, // Tauros + NATIONAL_DEX_TEDDIURSA, // Teddiursa + NATIONAL_DEX_SHIFTRY, // Tengulist + NATIONAL_DEX_TENTACOOL, // Tentacha + NATIONAL_DEX_TENTACRUEL, // Tentoxa + NATIONAL_DEX_TOGEPI, // Togepi + NATIONAL_DEX_TOGETIC, // Togetic + NATIONAL_DEX_SHARPEDO, // Tohaido + NATIONAL_DEX_TYPHLOSION, // Tornupto + NATIONAL_DEX_CUBONE, // Tragosso + NATIONAL_DEX_RALTS, // Trasla + NATIONAL_DEX_DROWZEE, // Traumato + NATIONAL_DEX_MISDREAVUS, // Traunfugil + NATIONAL_DEX_TROPIUS, // Tropius + NATIONAL_DEX_BLASTOISE, // Turtok + NATIONAL_DEX_CACNEA, // Tuska + NATIONAL_DEX_CROCONAW, // Tyracroc + NATIONAL_DEX_WEEPINBELL, // Ultrigaria + NATIONAL_DEX_URSARING, // Ursaring + NATIONAL_DEX_VIBRAVA, // Vibrava + NATIONAL_DEX_SEVIPER, // Vipitis + NATIONAL_DEX_VOLBEAT, // Volbeat + NATIONAL_DEX_MANECTRIC, // Voltenso + NATIONAL_DEX_MAREEP, // Voltilamm + NATIONAL_DEX_VOLTORB, // Voltobal + NATIONAL_DEX_NINETALES, // Vulnona + NATIONAL_DEX_VULPIX, // Vulpix + NATIONAL_DEX_FLAAFFY, // Waaty + NATIONAL_DEX_SWABLU, // Wablu + NATIONAL_DEX_WAILMER, // Wailmer + NATIONAL_DEX_WAILORD, // Wailord + NATIONAL_DEX_WALREIN, // Walraisa + NATIONAL_DEX_WURMPLE, // Waumpel + NATIONAL_DEX_SPINARAK, // Webarak + NATIONAL_DEX_WHISCASH, // Welsar + NATIONAL_DEX_CRADILY, // Wielie + NATIONAL_DEX_FURRET, // Wiesenior + NATIONAL_DEX_SENTRET, // Wiesor + NATIONAL_DEX_WINGULL, // Wingull + NATIONAL_DEX_WOBBUFFET, // Woingenau + NATIONAL_DEX_XATU, // Xatu + NATIONAL_DEX_YANMA, // Yanma + NATIONAL_DEX_ZAPDOS, // Zapdos + NATIONAL_DEX_ZIGZAGOON, // Zigzachs + NATIONAL_DEX_SABLEYE, // Zobiris + NATIONAL_DEX_ZUBAT, // Zubat + NATIONAL_DEX_DUSCLOPS, // Zwirrklop + NATIONAL_DEX_DUSKULL, // Zwirrlicht }; #endif static const u16 gPokedexOrder_Weight[] = { - 92, // Gastly - 93, // Haunter - 187, // Hoppip - 50, // Diglett - 351, // Castform - 109, // Koffing - 174, // Igglybuff - 200, // Misdreavus - 358, // Chimecho - 188, // Skiploom - 385, // Jirachi - 333, // Swablu - 292, // Shedinja - 175, // Togepi - 283, // Surskit - 16, // Pidgey - 191, // Sunkern - 339, // Barboach - 172, // Pichu - 298, // Azurill - 315, // Roselia - 177, // Natu - 21, // Spearow - 198, // Murkrow - 353, // Shuppet - 276, // Taillow - 102, // Exeggcute - 255, // Torchic - 270, // Lotad - 10, // Caterpie - 189, // Jumpluff - 173, // Cleffa - 13, // Weedle - 176, // Togetic - 147, // Dratini - 19, // Rattata - 284, // Masquerain - 265, // Wurmple - 211, // Qwilfish - 151, // Mew - 90, // Shellder - 273, // Seedot - 132, // Ditto - 69, // Bellsprout - 311, // Plusle - 52, // Meowth - 312, // Minun - 285, // Shroomish - 251, // Celebi - 222, // Corsola - 252, // Treecko - 327, // Spinda - 201, // Unown - 46, // Paras - 43, // Oddish - 39, // Jigglypuff - 290, // Nincada - 182, // Bellossom - 81, // Magnemite - 25, // Pikachu - 238, // Smoochum - 161, // Sentret - 70, // Weepinbell - 152, // Chikorita - 220, // Swinub - 133, // Eevee - 98, // Krabby - 104, // Cubone - 280, // Ralts - 1, // Bulbasaur - 23, // Ekans - 29, // Nidoran? - 204, // Pineco - 349, // Feebas - 138, // Omanyte - 41, // Zubat - 35, // Clefairy - 258, // Mudkip - 209, // Snubbull - 179, // Mareep - 155, // Cyndaquil - 116, // Horsea - 4, // Charmander - 192, // Sunflora - 183, // Marill - 194, // Wooper - 167, // Spinarak - 44, // Gloom - 370, // Luvdisc - 216, // Teddiursa - 32, // Nidoran? - 7, // Squirtle - 278, // Wingull - 158, // Totodile - 110, // Weezing - 37, // Vulpix - 11, // Metapod - 266, // Silcoon - 129, // Magikarp - 14, // Kakuna - 316, // Gulpin - 100, // Voltorb - 165, // Ledyba - 228, // Houndour - 300, // Skitty - 302, // Sableye - 307, // Meditite - 341, // Corphish - 190, // Aipom - 268, // Cascoon - 303, // Mawile - 140, // Kabuto - 40, // Wigglytuff - 27, // Sandshrew - 223, // Remoraid - 291, // Ninjask - 170, // Chinchou - 60, // Poliwag - 347, // Anorith - 49, // Venomoth - 354, // Banette - 2, // Ivysaur - 180, // Flaaffy - 261, // Poochyena - 360, // Wynaut - 206, // Dunsparce - 178, // Xatu - 355, // Duskull - 83, // Farfetch'd - 328, // Trapinch - 118, // Goldeen - 309, // Electrike - 329, // Vibrava - 71, // Victreebel - 153, // Bayleef - 225, // Delibird - 293, // Whismur - 148, // Dragonair - 361, // Snorunt - 263, // Zigzagoon - 314, // Illumise - 313, // Volbeat - 20, // Raticate - 45, // Vileplume - 156, // Quilava - 5, // Charmeleon - 58, // Growlithe - 256, // Combusken - 66, // Machop - 63, // Abra - 33, // Nidorino - 54, // Psyduck - 277, // Swellow - 38, // Ninetales - 30, // Nidorina - 61, // Poliwhirl - 74, // Geodude - 281, // Kirlia - 213, // Shuckle - 334, // Altaria - 318, // Carvanha - 236, // Tyrogue - 163, // Hoothoot - 240, // Magby - 343, // Baltoy - 253, // Grovyle - 352, // Kecleon - 171, // Lanturn - 8, // Wartortle - 368, // Gorebyss - 369, // Relicanth - 239, // Elekid - 340, // Whiscash - 345, // Lileep - 322, // Numel - 287, // Slakoth - 135, // Jolteon - 159, // Croconaw - 136, // Flareon - 117, // Seadra - 196, // Espeon - 367, // Huntail - 197, // Umbreon - 259, // Marshtomp - 274, // Nuzleaf - 215, // Sneasel - 56, // Mankey - 279, // Pelipper - 267, // Beautifly - 224, // Octillery - 184, // Azumarill - 202, // Wobbuffet - 134, // Vaporeon - 28, // Sandslash - 47, // Parasect - 15, // Beedrill - 89, // Muk - 17, // Pidgeotto - 88, // Grimer - 26, // Raichu - 77, // Ponyta - 125, // Electabuzz - 48, // Venonat - 325, // Spoink - 356, // Dusclops - 308, // Medicham - 269, // Dustox - 53, // Persian - 12, // Butterfree - 57, // Primeape - 96, // Drowzee - 162, // Furret - 233, // Porygon2 - 271, // Lombre - 264, // Linoone - 301, // Delcatty - 342, // Crawdaunt - 51, // Dugtrio - 168, // Ariados - 231, // Phanpy - 186, // Politoed - 120, // Staryu - 113, // Chansey - 139, // Omastar - 114, // Tangela - 218, // Slugma - 229, // Houndoom - 166, // Ledian - 79, // Slowpoke - 137, // Porygon - 262, // Mightyena - 193, // Yanma - 22, // Fearow - 185, // Sudowoodo - 119, // Seaking - 286, // Breloom - 84, // Doduo - 18, // Pidgeot - 363, // Spheal - 36, // Clefable - 380, // Latias - 310, // Manectric - 335, // Zangoose - 141, // Kabutops - 94, // Gengar - 294, // Loudred - 124, // Jynx - 164, // Noctowl - 203, // Girafarig - 371, // Bagon - 126, // Magmar - 105, // Marowak - 72, // Tentacool - 288, // Vigoroth - 242, // Blissey - 359, // Absol - 65, // Alakazam - 237, // Hitmontop - 282, // Gardevoir - 210, // Granbull - 106, // Hitmonlee - 107, // Hitmonchan - 227, // Skarmory - 331, // Cacnea - 257, // Blaziken - 254, // Sceptile - 336, // Seviper - 366, // Clamperl - 145, // Zapdos - 214, // Heracross - 62, // Poliwrath - 122, // Mr. mime - 127, // Pinsir - 272, // Ludicolo - 73, // Tentacruel - 42, // Golbat - 219, // Magcargo - 144, // Articuno - 221, // Piloswine - 123, // Scyther - 64, // Kadabra - 235, // Smeargle - 142, // Aerodactyl - 275, // Shiftry - 99, // Kingler - 31, // Nidoqueen - 82, // Magneton - 304, // Aron - 381, // Latios - 146, // Moltres - 346, // Cradily - 386, // Deoxys - 181, // Ampharos - 34, // Nidoking - 207, // Gligar - 24, // Arbok - 108, // Lickitung - 101, // Electrode - 348, // Armaldo - 67, // Machoke - 234, // Stantler - 326, // Grumpig - 246, // Larvitar - 169, // Crobat - 195, // Quagsire - 241, // Miltank - 97, // Hypno - 55, // Golduck - 332, // Cacturne - 80, // Slowbro - 157, // Typhlosion - 199, // Slowking - 115, // Kangaskhan - 121, // Starmie - 317, // Swalot - 324, // Torkoal - 260, // Swampert - 330, // Flygon - 295, // Exploud - 85, // Dodrio - 9, // Blastoise - 296, // Makuhita - 364, // Sealeo - 128, // Tauros - 319, // Sharpedo - 160, // Feraligatr - 86, // Seel - 6, // Charizard - 78, // Rapidash - 374, // Beldum - 299, // Nosepass - 3, // Venusaur - 357, // Tropius - 154, // Meganium - 373, // Salamence - 75, // Graveler - 344, // Claydol - 372, // Shelgon - 111, // Rhyhorn - 212, // Scizor - 87, // Dewgong - 112, // Rhydon - 232, // Donphan - 103, // Exeggutor - 305, // Lairon - 150, // Mewtwo - 217, // Ursaring - 205, // Forretress - 68, // Machamp - 320, // Wailmer - 289, // Slaking - 91, // Cloyster - 365, // Walrein - 247, // Pupitar - 230, // Kingdra - 338, // Solrock - 59, // Arcanine - 350, // Milotic - 337, // Lunatone - 378, // Regice - 243, // Raikou - 245, // Suicune - 244, // Entei - 250, // Ho-Oh - 248, // Tyranitar - 375, // Metang - 379, // Registeel - 384, // Rayquaza - 95, // Onix - 149, // Dragonite - 249, // Lugia - 131, // Lapras - 323, // Camerupt - 226, // Mantine - 377, // Regirock - 130, // Gyarados - 297, // Hariyama - 362, // Glalie - 76, // Golem - 382, // Kyogre - 306, // Aggron - 321, // Wailord - 208, // Steelix - 143, // Snorlax - 376, // Metagross - 383, // Groudon + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_NATU, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_MEW, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_ZUBAT, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_XATU, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_MUK, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_ARON, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_METANG, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_WAILORD, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_GROUDON, }; static const u16 gPokedexOrder_Height[] = { - 50, // Diglett - 298, // Azurill - 177, // Natu - 13, // Weedle - 172, // Pichu - 173, // Cleffa - 175, // Togepi - 351, // Castform - 174, // Igglybuff - 10, // Caterpie - 276, // Taillow - 132, // Ditto - 133, // Eevee - 315, // Roselia - 21, // Spearow - 16, // Pidgey - 191, // Sunkern - 90, // Shellder - 19, // Rattata - 81, // Magnemite - 46, // Paras - 265, // Wurmple - 385, // Jirachi - 104, // Cubone - 258, // Mudkip - 194, // Wooper - 116, // Horsea - 52, // Meowth - 29, // Nidoran? - 220, // Swinub - 151, // Mew - 333, // Swablu - 304, // Aron - 311, // Plusle - 312, // Minun - 102, // Exeggcute - 25, // Pikachu - 182, // Bellossom - 316, // Gulpin - 263, // Zigzagoon - 285, // Shroomish - 138, // Omanyte - 331, // Cacnea - 98, // Krabby - 280, // Ralts - 187, // Hoppip - 255, // Torchic - 366, // Clamperl - 74, // Geodude - 183, // Marill - 339, // Barboach - 238, // Smoochum - 100, // Voltorb - 290, // Nincada - 302, // Sableye - 198, // Murkrow - 211, // Qwilfish - 7, // Squirtle - 252, // Treecko - 343, // Baltoy - 43, // Oddish - 270, // Lotad - 39, // Jigglypuff - 283, // Surskit - 155, // Cyndaquil - 140, // Kabuto - 264, // Linoone - 324, // Torkoal - 32, // Nidoran? - 167, // Spinarak - 56, // Mankey - 273, // Seedot - 261, // Poochyena - 231, // Phanpy - 201, // Unown - 170, // Chinchou - 233, // Porygon2 - 60, // Poliwag - 371, // Bagon - 349, // Feebas - 353, // Shuppet - 158, // Totodile - 251, // Celebi - 360, // Wynaut - 27, // Sandshrew - 358, // Chimecho - 370, // Luvdisc - 228, // Houndour - 266, // Silcoon - 309, // Electrike - 4, // Charmander - 307, // Meditite - 278, // Wingull - 223, // Remoraid - 341, // Corphish - 222, // Corsola - 314, // Illumise - 209, // Snubbull - 37, // Vulpix - 246, // Larvitar - 374, // Beldum - 293, // Whismur - 204, // Pineco - 239, // Elekid - 35, // Clefairy - 213, // Shuckle - 216, // Teddiursa - 14, // Kakuna - 300, // Skitty - 176, // Togetic - 118, // Goldeen - 303, // Mawile - 179, // Mareep - 188, // Skiploom - 109, // Koffing - 51, // Dugtrio - 268, // Cascoon - 322, // Numel - 347, // Anorith - 313, // Volbeat - 163, // Hoothoot - 328, // Trapinch - 325, // Spoink - 11, // Metapod - 69, // Bellsprout - 361, // Snorunt - 20, // Raticate - 259, // Marshtomp - 277, // Swellow - 240, // Magby - 58, // Growlithe - 200, // Misdreavus - 1, // Bulbasaur - 236, // Tyrogue - 218, // Slugma - 287, // Slakoth - 281, // Kirlia - 190, // Aipom - 135, // Jolteon - 30, // Nidorina - 184, // Azumarill - 292, // Shedinja - 66, // Machop - 291, // Ninjask - 284, // Masquerain - 355, // Duskull - 192, // Sunflora - 189, // Jumpluff - 120, // Staryu - 180, // Flaaffy - 363, // Spheal - 54, // Psyduck - 219, // Magcargo - 83, // Farfetch'd - 41, // Zubat - 137, // Porygon - 161, // Sentret - 318, // Carvanha - 44, // Gloom - 26, // Raichu - 129, // Magikarp - 215, // Sneasel - 305, // Lairon - 256, // Combusken - 224, // Octillery - 33, // Nidorino - 136, // Flareon - 225, // Delibird - 72, // Tentacool - 63, // Abra - 253, // Grovyle - 340, // Whiscash - 156, // Quilava - 196, // Espeon - 88, // Grimer - 152, // Chikorita - 326, // Grumpig - 299, // Nosepass - 53, // Persian - 262, // Mightyena - 48, // Venonat - 82, // Magneton - 77, // Ponyta - 296, // Makuhita - 337, // Lunatone - 28, // Sandslash - 96, // Drowzee - 114, // Tangela - 57, // Primeape - 165, // Ledyba - 40, // Wigglytuff - 47, // Parasect - 139, // Omastar - 294, // Loudred - 8, // Wartortle - 75, // Graveler - 197, // Umbreon - 345, // Lileep - 61, // Poliwhirl - 134, // Vaporeon - 15, // Beedrill - 105, // Marowak - 70, // Weepinbell - 369, // Relicanth - 111, // Rhyhorn - 2, // Ivysaur - 352, // Kecleon - 274, // Nuzleaf - 267, // Beautifly - 17, // Pidgeotto - 168, // Ariados - 86, // Seel - 186, // Politoed - 159, // Croconaw - 113, // Chansey - 354, // Banette - 232, // Donphan - 121, // Starmie - 5, // Charmeleon - 221, // Piloswine - 12, // Butterfree - 329, // Vibrava - 125, // Electabuzz - 342, // Crawdaunt - 301, // Delcatty - 334, // Altaria - 372, // Shelgon - 38, // Ninetales - 207, // Gligar - 364, // Sealeo - 327, // Spinda - 247, // Pupitar - 79, // Slowpoke - 338, // Solrock - 241, // Miltank - 22, // Fearow - 45, // Vileplume - 89, // Muk - 205, // Forretress - 185, // Sudowoodo - 359, // Absol - 193, // Yanma - 269, // Dustox - 108, // Lickitung - 235, // Smeargle - 171, // Lanturn - 101, // Electrode - 271, // Lombre - 286, // Breloom - 153, // Bayleef - 117, // Seadra - 110, // Weezing - 279, // Pelipper - 375, // Metang - 31, // Nidoqueen - 332, // Cacturne - 275, // Shiftry - 308, // Medicham - 335, // Zangoose - 141, // Kabutops - 99, // Kingler - 64, // Kadabra - 119, // Seaking - 36, // Clefable - 126, // Magmar - 202, // Wobbuffet - 92, // Gastly - 122, // Mr. mime - 62, // Poliwrath - 128, // Tauros - 380, // Latias - 181, // Ampharos - 288, // Vigoroth - 166, // Ledian - 76, // Golem - 365, // Walrein - 84, // Doduo - 229, // Houndoom - 34, // Nidoking - 124, // Jynx - 107, // Hitmonchan - 234, // Stantler - 210, // Granbull - 237, // Hitmontop - 195, // Quagsire - 344, // Claydol - 260, // Swampert - 242, // Blissey - 272, // Ludicolo - 295, // Exploud - 206, // Dunsparce - 127, // Pinsir - 91, // Cloyster - 67, // Machoke - 203, // Girafarig - 18, // Pidgeot - 178, // Xatu - 346, // Cradily - 106, // Hitmonlee - 49, // Venomoth - 94, // Gengar - 214, // Heracross - 362, // Glalie - 123, // Scyther - 373, // Salamence - 310, // Manectric - 348, // Armaldo - 65, // Alakazam - 97, // Hypno - 164, // Noctowl - 73, // Tentacruel - 356, // Dusclops - 145, // Zapdos - 42, // Golbat - 376, // Metagross - 282, // Gardevoir - 9, // Blastoise - 80, // Slowbro - 93, // Haunter - 68, // Machamp - 377, // Regirock - 317, // Swalot - 254, // Sceptile - 227, // Skarmory - 55, // Golduck - 386, // Deoxys - 71, // Victreebel - 78, // Rapidash - 6, // Charizard - 367, // Huntail - 87, // Dewgong - 144, // Articuno - 157, // Typhlosion - 142, // Aerodactyl - 368, // Gorebyss - 217, // Ursaring - 154, // Meganium - 378, // Regice - 212, // Scizor - 230, // Kingdra - 147, // Dratini - 85, // Dodrio - 319, // Sharpedo - 169, // Crobat - 162, // Furret - 59, // Arcanine - 243, // Raikou - 257, // Blaziken - 323, // Camerupt - 112, // Rhydon - 379, // Registeel - 23, // Ekans - 330, // Flygon - 357, // Tropius - 381, // Latios - 245, // Suicune - 146, // Moltres - 3, // Venusaur - 103, // Exeggutor - 199, // Slowking - 248, // Tyranitar - 289, // Slaking - 320, // Wailmer - 150, // Mewtwo - 306, // Aggron - 143, // Snorlax - 226, // Mantine - 244, // Entei - 149, // Dragonite - 115, // Kangaskhan - 297, // Hariyama - 160, // Feraligatr - 131, // Lapras - 336, // Seviper - 24, // Arbok - 383, // Groudon - 250, // Ho-Oh - 148, // Dragonair - 382, // Kyogre - 249, // Lugia - 350, // Milotic - 130, // Gyarados - 384, // Rayquaza - 95, // Onix - 208, // Steelix - 321, // Wailord + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_NATU, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_MEW, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_ARON, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_ZUBAT, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_MUK, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_METANG, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_XATU, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_GROUDON, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_WAILORD, }; diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index d57c699da..ba2439a64 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -44,14 +44,8 @@ enum MAX }; -extern struct ToneData voicegroup_84537C0[]; -extern struct ToneData voicegroup_8452590[]; -extern struct ToneData voicegroup_8453DC0[]; -extern struct ToneData voicegroup_8452B90[]; -extern struct ToneData voicegroup_84543C0[]; -extern struct ToneData voicegroup_8453190[]; -extern struct ToneData voicegroup_84549C0[]; -extern struct ToneData voicegroup_8453790[]; +extern struct ToneData gCryTable[]; +extern struct ToneData gCryTable2[]; static EWRAM_DATA u8 gUnknown_020387B0 = 0; static EWRAM_DATA u8 gUnknown_020387B1 = 0; @@ -544,27 +538,27 @@ void Task_ProcessDriverTestInput(u8 taskId) { case 0: if (gUnknown_020387D8) - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_84537C0[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 0) + remaining]); else - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8452590[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 0) + remaining]); break; case 1: if (gUnknown_020387D8) - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8453DC0[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 1) + remaining]); else - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8452B90[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 1) + remaining]); break; case 2: if (gUnknown_020387D8) - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_84543C0[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 2) + remaining]); else - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8453190[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 2) + remaining]); break; case 3: if (gUnknown_020387D8) - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_84549C0[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 3) + remaining]); else - gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8453790[remaining]); + gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 3) + remaining]); break; } } diff --git a/src/field_camera.c b/src/field_camera.c index 29cdf0496..319c8a540 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -231,17 +231,17 @@ static void DrawMetatileAt(struct MapLayout *mapLayout, u16 offset, int x, int y u16 *metatiles; u16 metatileId = MapGridGetMetatileIdAt(x, y); - if (metatileId > 0x400) + if (metatileId > NUM_METATILES_TOTAL) metatileId = 0; - if (metatileId < 0x200) + if (metatileId < NUM_METATILES_IN_PRIMARY) { metatiles = mapLayout->primaryTileset->metatiles; } else { metatiles = mapLayout->secondaryTileset->metatiles; - metatileId -= 0x200; + metatileId -= NUM_METATILES_IN_PRIMARY; } DrawMetatile(MapGridGetMetatileLayerTypeAt(x, y), metatiles + metatileId * 8, offset); diff --git a/src/fieldmap.c b/src/fieldmap.c index 874df23b0..abb46fd35 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -463,15 +463,15 @@ void MapGridSetMetatileEntryAt(int x, int y, u16 metatile) u32 GetBehaviorByMetatileId(u16 metatile) { u16 *attributes; - if (metatile <= 0x1ff) + if (metatile < NUM_METATILES_IN_PRIMARY) { attributes = gMapHeader.mapLayout->primaryTileset->metatileAttributes; return attributes[metatile]; } - else if (metatile <= 0x3ff) + else if (metatile < NUM_METATILES_TOTAL) { attributes = gMapHeader.mapLayout->secondaryTileset->metatileAttributes; - return attributes[metatile - 0x200]; + return attributes[metatile - NUM_METATILES_IN_PRIMARY]; } else { @@ -878,17 +878,17 @@ void GetCameraCoords(u16 *x, u16 *y) *y = gSaveBlock1.pos.y; } -void sub_8056C98(struct Tileset *tileset, void *src) +void sub_8056C98(struct Tileset *tileset, void *dest) { if (tileset) { if (!tileset->isCompressed) { - CpuFastSet(tileset->tiles, src, 0x1000); + CpuFastCopy(tileset->tiles, dest, NUM_TILES_IN_PRIMARY * 16 * 2); } else { - LZ77UnCompVram(tileset->tiles, src); + LZ77UnCompVram(tileset->tiles, dest); } } } @@ -906,7 +906,7 @@ void sub_8056CBC(struct Tileset *tileset, int offset, int size) } else if (tileset->isSecondary == TRUE) { - LoadPalette(tileset->palettes + 0xc0, offset, size); + LoadPalette((u16*)tileset->palettes + (NUM_PALS_IN_PRIMARY * 16), offset, size); } else { @@ -918,24 +918,24 @@ void sub_8056CBC(struct Tileset *tileset, int offset, int size) void sub_8056D28(struct MapLayout *mapLayout) { - void *src = (void*)(BG_VRAM); - sub_8056C98(mapLayout->primaryTileset, src); + void *dest = (void*)(BG_VRAM); + sub_8056C98(mapLayout->primaryTileset, dest); } void sub_8056D38(struct MapLayout *mapLayout) { - void *src = (void*)(BG_VRAM + 0x4000); - sub_8056C98(mapLayout->secondaryTileset, src); + void *dest = (void*)(BG_VRAM + NUM_TILES_IN_PRIMARY * 16 * 2); + sub_8056C98(mapLayout->secondaryTileset, dest); } void apply_map_tileset1_palette(struct MapLayout *mapLayout) { - sub_8056CBC(mapLayout->primaryTileset, 0, 0xc0); + sub_8056CBC(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2); } void apply_map_tileset2_palette(struct MapLayout *mapLayout) { - sub_8056CBC(mapLayout->secondaryTileset, 0x60, 0xc0); + sub_8056CBC(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2); } void copy_map_tileset1_tileset2_to_vram(struct MapLayout *mapLayout) diff --git a/src/item_menu.c b/src/item_menu.c index 12d02ebd8..95a84b1fb 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1119,13 +1119,13 @@ static void sub_80A41E0(u8 *a, u16 b, const u8 *c, u16 d, u8 e) AlignInt1InMenuWindow(a, d, 0x78, 1); } -static u8 *sub_80A425C(u8 taskId, u8 *text, u8 c) +static u8 *sub_80A425C(u8 taskId, u8 *text, u8 itemSlot) { - if (gTasks[taskId].data[10] - gBagPocketScrollStates[sCurrentBagPocket].scrollTop - 1 == c) + if (gTasks[taskId].data[10] - gBagPocketScrollStates[sCurrentBagPocket].scrollTop - 1 == itemSlot) { text[0] = EXT_CTRL_CODE_BEGIN; text[1] = 1; - text[2] = 2; + text[2] = TEXT_COLOR_RED; text += 3; } return text; @@ -1222,275 +1222,61 @@ static void sub_80A444C(u16 a, int b, int c, int d) } } -// more gBGTilemapBuffers shenanigans -#ifdef NONMATCHING -static void sub_80A4548(u16 a, int b, int c, int d) +static void sub_80A4548(u16 taskId, int topItemOffset, int bottomItemOffset, int d) { u8 i; - for (i = b; i <= c; i++) + for (i = topItemOffset; i <= bottomItemOffset; i++) { - u8 r4; - u8 sp10; - u32 r5; + u8 slot; + u8 y; + u16 tilemapOffset; u8 *text; if (sub_80A42B0(i, d) == TRUE) break; - r4 = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + i; - sp10 = i * 2 + 2; - r5 = sp10 * 32 + 14; + + slot = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + i; + y = i * 2 + 2; + tilemapOffset = y * 32 + 14; text = gStringVar1; - text = sub_80A425C(a, text, i); - if (gCurrentBagPocketItemSlots[r4].itemId < 0x153) + text = sub_80A425C(taskId, text, i); + + if (gCurrentBagPocketItemSlots[slot].itemId < ITEM_HM01_CUT) { - const u8 *r2; - - gBGTilemapBuffers[2][r5 + 0] = 0x59; - gBGTilemapBuffers[2][r5 + 1] = 0x4F; - gBGTilemapBuffers[2][r5 + 32] = 0x69; - gBGTilemapBuffers[2][r5 + 33] = 0x4F; - r2 = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[r4].itemId)]; - sub_80A41E0(text, gCurrentBagPocketItemSlots[r4].itemId - 288, r2, gCurrentBagPocketItemSlots[r4].quantity, 2); + const u8 *moveName; + gBGTilemapBuffers[2][tilemapOffset + 0] = 0x59; + gBGTilemapBuffers[2][tilemapOffset + 1] = 0x4F; + gBGTilemapBuffers[2][tilemapOffset + 32] = 0x69; + gBGTilemapBuffers[2][tilemapOffset + 33] = 0x4F; + moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[slot].itemId)]; + sub_80A41E0(text, gCurrentBagPocketItemSlots[slot].itemId - (ITEM_TM01_FOCUS_PUNCH - 1), moveName, gCurrentBagPocketItemSlots[slot].quantity, 2); } else { const u8 *moveName; - - gBGTilemapBuffers[2][r5 + 0] = 0x105D; - gBGTilemapBuffers[2][r5 + 1] = 0x105E; - gBGTilemapBuffers[2][r5 + 32] = 0x106D; - gBGTilemapBuffers[2][r5 + 33] = 0x106E; + gBGTilemapBuffers[2][tilemapOffset + 0] = 0x105D; + gBGTilemapBuffers[2][tilemapOffset + 1] = 0x105E; + gBGTilemapBuffers[2][tilemapOffset + 32] = 0x106D; + gBGTilemapBuffers[2][tilemapOffset + 33] = 0x106E; text[0] = EXT_CTRL_CODE_BEGIN; text[1] = 0x13; text[2] = 0x11; text += 3; - text = ConvertIntToDecimalString(text, gCurrentBagPocketItemSlots[r4].itemId); + text = ConvertIntToDecimalString(text, gCurrentBagPocketItemSlots[slot].itemId - (ITEM_HM01_CUT - 1)); text[0] = EXT_CTRL_CODE_BEGIN; text[1] = 0x13; text[2] = 0x18; text += 3; - moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[r4].itemId)]; + moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[slot].itemId)]; AlignStringInMenuWindow(text, moveName, 0x78, 0); } - Menu_PrintText(gStringVar1, 14, sp10); + + Menu_PrintText(gStringVar1, 14, y); } } -#else -NAKED -static void sub_80A4548(u16 a, int b, int c, int d) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x14\n\ - str r2, [sp, 0x8]\n\ - str r3, [sp, 0xC]\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - str r0, [sp, 0x4]\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r8, r1\n\ - ldr r0, _080A456C @ =gBGTilemapBuffers + 0x1000\n\ - mov r9, r0\n\ - b _080A46C2\n\ - .align 2, 0\n\ -_080A456C: .4byte gBGTilemapBuffers + 0x1000\n\ -_080A4570:\n\ - ldr r1, _080A461C @ =gBagPocketScrollStates\n\ - ldr r0, _080A4620 @ =sCurrentBagPocket\n\ - ldrb r0, [r0]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - ldrb r4, [r0, 0x1]\n\ - add r4, r8\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - mov r1, r8\n\ - lsls r0, r1, 25\n\ - movs r3, 0x80\n\ - lsls r3, 18\n\ - adds r0, r3\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x10]\n\ - lsls r0, 5\n\ - adds r0, 0xE\n\ - adds r5, r0, 0\n\ - ldr r6, _080A4624 @ =gStringVar1\n\ - ldr r1, [sp, 0x4]\n\ - lsls r0, r1, 24\n\ - lsrs r0, 24\n\ - adds r1, r6, 0\n\ - mov r2, r8\n\ - bl sub_80A425C\n\ - adds r6, r0, 0\n\ - ldr r3, _080A4628 @ =gCurrentBagPocketItemSlots\n\ - mov r10, r3\n\ - ldr r0, [r3]\n\ - lsls r7, r4, 2\n\ - adds r3, r7, r0\n\ - ldrh r1, [r3]\n\ - movs r0, 0xA9\n\ - lsls r0, 1\n\ - cmp r1, r0\n\ - bhi _080A4634\n\ - lsls r0, r5, 1\n\ - add r0, r9\n\ - movs r1, 0x59\n\ - strh r1, [r0]\n\ - adds r0, r5, 0x1\n\ - lsls r0, 1\n\ - add r0, r9\n\ - movs r2, 0x4F\n\ - strh r2, [r0]\n\ - adds r0, r5, 0\n\ - adds r0, 0x20\n\ - lsls r0, 1\n\ - add r0, r9\n\ - movs r1, 0x69\n\ - strh r1, [r0]\n\ - adds r0, r5, 0\n\ - adds r0, 0x21\n\ - lsls r0, 1\n\ - add r0, r9\n\ - strh r2, [r0]\n\ - ldrh r0, [r3]\n\ - bl ItemIdToBattleMoveId\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - movs r1, 0xD\n\ - adds r2, r0, 0\n\ - muls r2, r1\n\ - ldr r0, _080A462C @ =gMoveNames\n\ - adds r2, r0\n\ - mov r1, r10\n\ - ldr r0, [r1]\n\ - adds r0, r7, r0\n\ - ldr r3, _080A4630 @ =0xfffffee0\n\ - adds r1, r3, 0\n\ - ldrh r3, [r0]\n\ - adds r1, r3\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - ldrh r3, [r0, 0x2]\n\ - movs r0, 0x2\n\ - str r0, [sp]\n\ - adds r0, r6, 0\n\ - bl sub_80A41E0\n\ - b _080A46AE\n\ - .align 2, 0\n\ -_080A461C: .4byte gBagPocketScrollStates\n\ -_080A4620: .4byte sCurrentBagPocket\n\ -_080A4624: .4byte gStringVar1\n\ -_080A4628: .4byte gCurrentBagPocketItemSlots\n\ -_080A462C: .4byte gMoveNames\n\ -_080A4630: .4byte 0xfffffee0\n\ -_080A4634:\n\ - lsls r0, r5, 1\n\ - add r0, r9\n\ - ldr r1, _080A46EC @ =0x0000105d\n\ - strh r1, [r0]\n\ - adds r0, r5, 0x1\n\ - lsls r0, 1\n\ - add r0, r9\n\ - adds r1, 0x1\n\ - strh r1, [r0]\n\ - adds r0, r5, 0\n\ - adds r0, 0x20\n\ - lsls r0, 1\n\ - add r0, r9\n\ - adds r1, 0xF\n\ - strh r1, [r0]\n\ - adds r0, r5, 0\n\ - adds r0, 0x21\n\ - lsls r0, 1\n\ - add r0, r9\n\ - adds r1, 0x1\n\ - strh r1, [r0]\n\ - movs r0, 0xFC\n\ - strb r0, [r6]\n\ - movs r4, 0x13\n\ - strb r4, [r6, 0x1]\n\ - movs r0, 0x11\n\ - strb r0, [r6, 0x2]\n\ - adds r6, 0x3\n\ - mov r1, r10\n\ - ldr r0, [r1]\n\ - adds r0, r7, r0\n\ - ldrh r1, [r0]\n\ - ldr r3, _080A46F0 @ =0xfffffeae\n\ - adds r1, r3\n\ - adds r0, r6, 0\n\ - bl ConvertIntToDecimalString\n\ - adds r6, r0, 0\n\ - movs r0, 0xFC\n\ - strb r0, [r6]\n\ - strb r4, [r6, 0x1]\n\ - movs r0, 0x18\n\ - strb r0, [r6, 0x2]\n\ - adds r6, 0x3\n\ - mov r1, r10\n\ - ldr r0, [r1]\n\ - adds r0, r7, r0\n\ - ldrh r0, [r0]\n\ - bl ItemIdToBattleMoveId\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - movs r1, 0xD\n\ - muls r1, r0\n\ - ldr r0, _080A46F4 @ =gMoveNames\n\ - adds r1, r0\n\ - adds r0, r6, 0\n\ - movs r2, 0x78\n\ - movs r3, 0\n\ - bl AlignStringInMenuWindow\n\ -_080A46AE:\n\ - ldr r0, _080A46F8 @ =gStringVar1\n\ - movs r1, 0xE\n\ - ldr r2, [sp, 0x10]\n\ - bl Menu_PrintText\n\ - mov r0, r8\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ -_080A46C2:\n\ - ldr r3, [sp, 0x8]\n\ - cmp r8, r3\n\ - bgt _080A46DA\n\ - mov r0, r8\n\ - ldr r1, [sp, 0xC]\n\ - bl sub_80A42B0\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x1\n\ - beq _080A46DA\n\ - b _080A4570\n\ -_080A46DA:\n\ - add sp, 0x14\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080A46EC: .4byte 0x0000105d\n\ -_080A46F0: .4byte 0xfffffeae\n\ -_080A46F4: .4byte gMoveNames\n\ -_080A46F8: .4byte gStringVar1\n\ - .syntax divided\n"); -} -#endif -static void sub_80A46FC(u16 a, int b, int c, int d) +static void sub_80A46FC(u16 taskId, int b, int c, int d) { u8 i; @@ -1512,29 +1298,29 @@ static void sub_80A46FC(u16 a, int b, int c, int d) gBGTilemapBuffers[2][var] = 0x69; text = gStringVar1; - text = sub_80A425C(a, text, i); + text = sub_80A425C(taskId, text, i); CopyItemName(gCurrentBagPocketItemSlots[r4].itemId, gStringVar2); sub_80A41E0(text, gCurrentBagPocketItemSlots[r4].itemId - 0x84, gStringVar2, gCurrentBagPocketItemSlots[r4].quantity, 3); Menu_PrintText(gStringVar1, 14, r5); } } -static void sub_80A47E8(u16 a, int b, int c, int d) +static void sub_80A47E8(u16 taskId, int topItemOffset, int bottomItemOffset, int d) { switch (sCurrentBagPocket) { case BAG_POCKET_ITEMS: case BAG_POCKET_POKE_BALLS: - sub_80A4380(a, b, c, d); + sub_80A4380(taskId, topItemOffset, bottomItemOffset, d); break; case BAG_POCKET_KEY_ITEMS: - sub_80A444C(a, b, c, d); + sub_80A444C(taskId, topItemOffset, bottomItemOffset, d); break; case BAG_POCKET_TMs_HMs: - sub_80A4548(a, b, c, d); + sub_80A4548(taskId, topItemOffset, bottomItemOffset, d); break; case BAG_POCKET_BERRIES: - sub_80A46FC(a, b, c, d); + sub_80A46FC(taskId, topItemOffset, bottomItemOffset, d); break; } if (gBagPocketScrollStates[sCurrentBagPocket].scrollTop != 0) @@ -1548,9 +1334,9 @@ static void sub_80A47E8(u16 a, int b, int c, int d) SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); } -static void sub_80A48E8(u16 taskId, int b, int c) +static void sub_80A48E8(u16 taskId, int topItemOffset, int bottomItemOffset) { - sub_80A47E8(taskId, b, c, 0); + sub_80A47E8(taskId, topItemOffset, bottomItemOffset, 0); } static void sub_80A48F8(u16 taskId) diff --git a/src/libs/m4a_tables.c b/src/libs/m4a_tables.c index 91f00a31d..9a4ea32e6 100644 --- a/src/libs/m4a_tables.c +++ b/src/libs/m4a_tables.c @@ -261,7 +261,7 @@ const struct PokemonCrySong gPokemonCrySongTemplate = 0, // block count 255, // priority 0, // reverb - (struct ToneData *)&voicegroup_pokemon_cry, + (struct ToneData *)&voicegroup000, NULL, NULL, 0, diff --git a/src/pokedex.c b/src/pokedex.c index eb4d1d918..caa6a1565 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -26,7 +26,6 @@ #include "scanline_effect.h" #include "ewram.h" -#define NATIONAL_DEX_COUNT 386 struct PokedexListItem { @@ -1971,7 +1970,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode) { default: case DEX_MODE_HOENN: - vars[0] = 202; + vars[0] = HOENN_DEX_COUNT; vars[1] = 1; break; case DEX_MODE_NATIONAL: @@ -1982,7 +1981,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode) } else { - vars[0] = 202; + vars[0] = HOENN_DEX_COUNT; vars[1] = 1; } break; @@ -2028,7 +2027,7 @@ static void SortPokedex(u8 dexMode, u8 sortMode) } break; case 1: - for (i = 0; i < 411; i++) + for (i = 0; i < POKEMON_SLOTS_NUMBER - 1; i++) { vars[2] = gPokedexOrder_Alphabetical[i]; @@ -4060,7 +4059,7 @@ u16 GetHoennPokedexCount(u8 caseID) u16 count = 0; u16 i; - for (i = 0; i < 202; i++) + for (i = 0; i < HOENN_DEX_COUNT; i++) { switch (caseID) { diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 30e9503cd..4814c900d 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -12,6 +12,7 @@ #include "main.h" #include "move_tutor_menu.h" #include "pokemon.h" +#include "pokedex.h" #include "random.h" #include "overworld.h" #include "rom_8077ABC.h" @@ -390,10 +391,10 @@ u16 HoennPokedexNumToSpecies(u16 hoennNum) species = 0; - while (species < 411 && gSpeciesToHoennPokedexNum[species] != hoennNum) + while (species < POKEMON_SLOTS_NUMBER - 1 && gSpeciesToHoennPokedexNum[species] != hoennNum) species++; - if (species == 411) + if (species == POKEMON_SLOTS_NUMBER - 1) return 0; return species + 1; @@ -408,10 +409,10 @@ u16 NationalPokedexNumToSpecies(u16 nationalNum) species = 0; - while (species < 411 && gSpeciesToNationalPokedexNum[species] != nationalNum) + while (species < POKEMON_SLOTS_NUMBER - 1 && gSpeciesToNationalPokedexNum[species] != nationalNum) species++; - if (species == 411) + if (species == POKEMON_SLOTS_NUMBER - 1) return 0; return species + 1; @@ -426,10 +427,10 @@ u16 NationalToHoennOrder(u16 nationalNum) hoennNum = 0; - while (hoennNum < 411 && gHoennToNationalOrder[hoennNum] != nationalNum) + while (hoennNum < POKEMON_SLOTS_NUMBER - 1 && gHoennToNationalOrder[hoennNum] != nationalNum) hoennNum++; - if (hoennNum == 411) + if (hoennNum == POKEMON_SLOTS_NUMBER - 1) return 0; return hoennNum + 1; @@ -1095,7 +1096,7 @@ u16 SpeciesToPokedexNum(u16 species) else { species = SpeciesToHoennPokedexNum(species); - if (species <= 202) + if (species <= HOENN_DEX_COUNT) return species; return 0xFFFF; } diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 8ae582222..710756c11 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -5,6 +5,7 @@ #include "battle.h" #include "data2.h" #include "de_rom_8040FE0.h" +#include "decompress.h" #include "event_data.h" #include "constants/flags.h" #include "landmark.h" @@ -281,7 +282,7 @@ void sub_80F13FC(void); void sub_80F1438(void); static void sub_80F1494(void); bool8 sub_80F162C(u8); -void sub_80F01E0(u16); +static void sub_80F01E0(u16); static void sub_80F19FC(void); static void sub_80F1A74(void); static void sub_80F1A80(void); @@ -347,6 +348,15 @@ static void sub_80F42C4(u8*); static void sub_80F4394(void); u8 *sub_80F6514(u8*, u16, u8); static u8 *sub_80F443C(u8 *, u16); +void sub_80F55AC(u8*, struct UnkPokenav11 *); +static void sub_80F4CF0(void); +static void sub_80F4D44(void); +static bool8 sub_80F4D88(void); +static void sub_80F53EC(struct UnkPokenav11*, struct UnkPokenav11*); +static bool8 sub_80F5504(void); +static bool8 sub_80F5264(void); +static bool8 sub_80F52F8(void); +static bool8 sub_80F5364(void); extern void sub_80F0900(void); extern void sub_80F01A4(void); @@ -375,13 +385,10 @@ extern u8 sub_80F68E8(); extern void sub_80F66E0(); extern void sub_80F638C(); extern bool8 sub_80F63D0(); -extern void sub_80F4CF0(); extern void sub_80EFF34(); extern bool8 sub_80EFF68(); extern void sub_80F6134(); extern u8 sub_80F5DD4(); -extern void sub_80F4D44(); -extern bool8 sub_80F4D88(); extern void sub_80F0264(u8); extern bool8 sub_80F02A0(); extern void sub_80EF9F8(void); @@ -4676,7 +4683,7 @@ void sub_80F01A4(void) REG_WINOUT = 0x001B; } -void sub_80F01E0(u16 a) +static void sub_80F01E0(u16 a) { Menu_PrintText(gUnknown_083DFEC4->unk8829[a], 13, 1); @@ -8100,7 +8107,7 @@ static u8 *sub_80F445C(u8 *arg0, u16 arg1) return buffer; } -int sub_80F44B0(u16 box, u16 monIndex, int monDataField, int *text) +u32 sub_80F44B0(u16 box, u16 monIndex, int monDataField, int *text) { if (box == 14) { @@ -8126,7 +8133,7 @@ static void SetMonMarkings(u16 box, u16 monIndex, u8 markings) SetBoxMonData(&gPokemonStorage.boxes[box][monIndex], MON_DATA_MARKINGS, &markings); } -void sub_80F45A0(s16 arg0, u8 arg1) +static void sub_80F45A0(s16 arg0, u8 arg1) { u8 box; u8 var0 = gUnknown_083DFEC4->unk893c[arg0].unk4; @@ -8148,3 +8155,585 @@ void sub_80F45A0(s16 arg0, u8 arg1) gUnknown_083DFEC4->unk8937[arg1] = var0; } } + +static void sub_80F468C(s16 arg0, u8 arg1) +{ + u16 i; + u16 box; + u16 monIndex; + + if (gUnknown_083DFEC4->unk893c[arg0].unk4) + { + box = gUnknown_083DFEC4->unk893c[arg0].unk1; + monIndex = gUnknown_083DFEC4->unk893c[arg0].partyIdx; + gUnknown_083DFEC4->unk8ff0[arg1][0] = sub_80F44B0(box, monIndex, MON_DATA_COOL, NULL); + gUnknown_083DFEC4->unk8ff0[arg1][1] = sub_80F44B0(box, monIndex, MON_DATA_TOUGH, NULL); + gUnknown_083DFEC4->unk8ff0[arg1][2] = sub_80F44B0(box, monIndex, MON_DATA_SMART, NULL); + gUnknown_083DFEC4->unk8ff0[arg1][3] = sub_80F44B0(box, monIndex, MON_DATA_CUTE, NULL); + gUnknown_083DFEC4->unk8ff0[arg1][4] = sub_80F44B0(box, monIndex, MON_DATA_BEAUTY, NULL); + + gUnknown_083DFEC4->unk8931[arg1] = sub_80F44B0(box, monIndex, MON_DATA_SHEEN, NULL) != 255 + ? sub_80F44B0(box, monIndex, MON_DATA_SHEEN, NULL) / 29 + : 9; + + gUnknown_083DFEC4->unk8934[arg1] = sub_80F44B0(box, monIndex, MON_DATA_MARKINGS, NULL); + sub_80F55AC(gUnknown_083DFEC4->unk8ff0[arg1], gUnknown_083DFEC4->unk9004[arg1]); + } + else + { + for (i = 0; i < 5; i++) + { + gUnknown_083DFEC4->unk8ff0[arg1][i] = 0; + gUnknown_083DFEC4->unk9004[arg1][i].unk0 = 0x9B; + gUnknown_083DFEC4->unk9004[arg1][i].unk2 = 0x5B; + } + } +} + +static void sub_80F4824(s16 arg0, u8 arg1) +{ + u16 species; + u32 otId; + u32 personality; + u16 box; + u16 monIndex; + + if (gUnknown_083DFEC4->unk893c[arg0].unk4) + { + box = gUnknown_083DFEC4->unk893c[arg0].unk1; + monIndex = gUnknown_083DFEC4->unk893c[arg0].partyIdx; + species = sub_80F44B0(box, monIndex, MON_DATA_SPECIES2, NULL); + otId = sub_80F44B0(box, monIndex, MON_DATA_OT_ID, NULL); + personality = sub_80F44B0(box, monIndex, MON_DATA_PERSONALITY, NULL); + + HandleLoadSpecialPokePic( + &gMonFrontPicTable[species], + gMonFrontPicCoords[species].coords, + 1, + (intptr_t)gUnknown_083DFEC4->unk131E4, + gUnknown_083DFEC4->unkD1E4[arg1], + species, + personality); + + LZ77UnCompWram(GetMonSpritePalFromOtIdPersonality(species, otId, personality), gUnknown_083DFEC4->unk0[arg1]); + gUnknown_083DFEC4->unkD1D6[arg1] = species; + } +} + +void sub_80F4900(s16 arg0, u8 arg1) +{ + sub_80F45A0(arg0, arg1); + sub_80F468C(arg0, arg1); + sub_80F4824(arg0, arg1); +} + +void sub_80F492C(void) +{ + gUnknown_083DFEC4->unk8FE4 = 0; +} + +#ifdef NONMATCHING +// registers r3/r4 are swapped +void sub_80F4944(struct UnkUsePokeblockSub *arg0) +{ + u16 i; + u16 r3; + u16 r4; + + i = 0; + r4 = gUnknown_083DFEC4->unk8FE4; + r3 = r4 / 2; + while (r3 != r4) + { + if (arg0->unk0 > gUnknown_083DFEC4->unk893c[r3].unk0) + r4 = r3; + else + i = r3 + 1; + + r3 = ((r4 - i) / 2) + i; + } + + r4 = gUnknown_083DFEC4->unk8FE4; + while (r4 > r3) + { + gUnknown_083DFEC4->unk893c[r4] = gUnknown_083DFEC4->unk893c[r4 - 1]; + r4--; + } + + gUnknown_083DFEC4->unk893c[r3] = *arg0; + gUnknown_083DFEC4->unk8FE4++; +} +#else +NAKED +void sub_80F4944(struct UnkUsePokeblockSub *arg0) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + mov r12, r0\n\ + movs r2, 0\n\ + ldr r1, _080F4978 @ =gUnknown_083DFEC4\n\ + ldr r5, [r1]\n\ + ldr r3, _080F497C @ =0x00008fe4\n\ + adds r0, r5, r3\n\ + ldrh r4, [r0]\n\ + lsrs r3, r4, 1\n\ + mov r8, r1\n\ + cmp r4, r3\n\ + beq _080F499C\n\ + adds r6, r5, 0\n\ + mov r0, r12\n\ + ldrb r5, [r0]\n\ + ldr r7, _080F4980 @ =0x0000893c\n\ +_080F4968:\n\ + lsls r0, r3, 2\n\ + adds r0, r6, r0\n\ + adds r0, r7\n\ + ldrb r0, [r0]\n\ + cmp r5, r0\n\ + bls _080F4984\n\ + adds r4, r3, 0\n\ + b _080F498A\n\ + .align 2, 0\n\ +_080F4978: .4byte gUnknown_083DFEC4\n\ +_080F497C: .4byte 0x00008fe4\n\ +_080F4980: .4byte 0x0000893c\n\ +_080F4984:\n\ + adds r0, r3, 0x1\n\ + lsls r0, 16\n\ + lsrs r2, r0, 16\n\ +_080F498A:\n\ + subs r0, r4, r2\n\ + lsrs r1, r0, 31\n\ + adds r0, r1\n\ + asrs r0, 1\n\ + adds r0, r2, r0\n\ + lsls r0, 16\n\ + lsrs r3, r0, 16\n\ + cmp r4, r3\n\ + bne _080F4968\n\ +_080F499C:\n\ + mov r1, r8\n\ + ldr r2, [r1]\n\ + ldr r1, _080F49EC @ =0x00008fe4\n\ + adds r0, r2, r1\n\ + ldrh r4, [r0]\n\ + lsls r6, r3, 2\n\ + cmp r4, r3\n\ + bls _080F49C6\n\ + ldr r0, _080F49F0 @ =0x0000893c\n\ + adds r5, r2, r0\n\ +_080F49B0:\n\ + lsls r2, r4, 2\n\ + adds r2, r5, r2\n\ + subs r1, r4, 0x1\n\ + lsls r0, r1, 2\n\ + adds r0, r5, r0\n\ + ldr r0, [r0]\n\ + str r0, [r2]\n\ + lsls r1, 16\n\ + lsrs r4, r1, 16\n\ + cmp r4, r3\n\ + bhi _080F49B0\n\ +_080F49C6:\n\ + mov r1, r8\n\ + ldr r2, [r1]\n\ + ldr r3, _080F49F0 @ =0x0000893c\n\ + adds r0, r2, r3\n\ + adds r0, r6\n\ + mov r3, r12\n\ + ldr r1, [r3]\n\ + str r1, [r0]\n\ + ldr r0, _080F49EC @ =0x00008fe4\n\ + adds r2, r0\n\ + ldrh r0, [r2]\n\ + adds r0, 0x1\n\ + strh r0, [r2]\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080F49EC: .4byte 0x00008fe4\n\ +_080F49F0: .4byte 0x0000893c\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +void sub_80F49F4(void) +{ + u16 i; + + gUnknown_083DFEC4->unk893c[0].unk2 = 1; + for (i = 1; i < gUnknown_083DFEC4->unk8FE4; i++) + { + if (gUnknown_083DFEC4->unk893c[i].unk0 == gUnknown_083DFEC4->unk893c[i - 1].unk0) + gUnknown_083DFEC4->unk893c[i].unk2 = gUnknown_083DFEC4->unk893c[i - 1].unk2; + else + gUnknown_083DFEC4->unk893c[i].unk2 = i + 1; + } + + gUnknown_083DFEC4->unk876C = 0; + gUnknown_083DFEC4->unk8770 = 0; + gUnknown_083DFEC4->unk876E = 0; + gUnknown_083DFEC4->unk8772 = gUnknown_083DFEC4->unk8FE4 < 9 ? (gUnknown_083DFEC4->unk8FE4 - 1) : 7; + gUnknown_083DFEC4->unk8774 = gUnknown_083DFEC4->unk8FE4 - 1; + gUnknown_083DFEC4->unk87C9 = gUnknown_083DFEC4->unk8774 > 7; +} + +void sub_80F4B20(void) +{ + s16 var0; + s16 var1; + + sub_80F4900(gUnknown_083DFEC4->unk87DC, 0); + sub_80F2E18(0); + if (gUnknown_083DFEC4->unk87DA == 1) + { + gUnknown_083DFEC4->unk8fe9 = 0; + gUnknown_083DFEC4->unk8FEA = 0; + gUnknown_083DFEC4->unk8FEB = 0; + } + else + { + gUnknown_083DFEC4->unk8fe9 = 0; + gUnknown_083DFEC4->unk8FEA = 1; + gUnknown_083DFEC4->unk8FEB = 2; + + var0 = gUnknown_083DFEC4->unk87DC + 1; + if (var0 >= gUnknown_083DFEC4->unk87DA) + var0 = 0; + + var1 = gUnknown_083DFEC4->unk87DC - 1; + if (var1 < 0) + var1 = gUnknown_083DFEC4->unk87DA - 1; + + sub_80F4900(var0, 1); + sub_80F4900(var1, 2); + } +} + +void sub_80F4BD0(void) +{ + u16 i, j; + + for (i = 0, j = 0; i < gUnknown_083DFEC4->unk8828; i++) + { + if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) + { + gUnknown_083DFEC4->unk893c[j].unk1 = 14; + gUnknown_083DFEC4->unk893c[j].partyIdx = i; + gUnknown_083DFEC4->unk893c[j].unk2 = j + 1; + gUnknown_083DFEC4->unk893c[j].unk4 = 1; + j++; + } + } + + gUnknown_083DFEC4->unk893c[j].unk1 = 0; + gUnknown_083DFEC4->unk893c[j].partyIdx = 0; + gUnknown_083DFEC4->unk893c[j].unk2 = 0; + gUnknown_083DFEC4->unk893c[j].unk4 = 0; + gUnknown_083DFEC4->unk87DC = 0; + gUnknown_083DFEC4->unk87DA = j + 1; + sub_80F4B20(); + gUnknown_083DFEC4->unk87CB = 1; +} + +static void sub_80F4CF0(void) +{ + gUnknown_083DFEC4->unk87DC = gUnknown_083DFEC4->unk876E; + sub_80F4B20(); + + if (gUnknown_083DFEC4->unk8774 == 0) + gUnknown_083DFEC4->unk87CB = 0; + else + gUnknown_083DFEC4->unk87CB = 1; +} + +static void sub_80F4D44(void) +{ + gUnknown_083DFEC4->unk8FE6 = 0; + gUnknown_083DFEC4->unk8FE7 = 0; + sub_80F492C(); + + if (!gUnknown_083DFEC4->unk6DAC) + while (sub_80F4D88()); +} + +static bool8 sub_80F4D88(void) +{ + u16 i; + register int mask asm("r3"); // FIXME + int nextValue; + struct UnkUsePokeblockSub var0; + + switch (gUnknown_083DFEC4->unk8FE6) + { + default: + var0.unk4 = 1; + for (i = 0; i < 15; i++) + { + + if (GetBoxMonData(&gPokemonStorage.boxes[gUnknown_083DFEC4->unk8FE6][gUnknown_083DFEC4->unk8FE7], MON_DATA_SPECIES) + && !GetBoxMonData(&gPokemonStorage.boxes[gUnknown_083DFEC4->unk8FE6][gUnknown_083DFEC4->unk8FE7], MON_DATA_IS_EGG)) + { + var0.unk1 = gUnknown_083DFEC4->unk8FE6; + var0.partyIdx = gUnknown_083DFEC4->unk8FE7; + var0.unk0 = GetBoxMonData( + &gPokemonStorage.boxes[gUnknown_083DFEC4->unk8FE6][gUnknown_083DFEC4->unk8FE7], + gUnknown_083DFEC4->unk87D8); + sub_80F4944(&var0); + } + + gUnknown_083DFEC4->unk8FE7++; + mask = 0xFF; + if (gUnknown_083DFEC4->unk8FE7 == 30) + { + gUnknown_083DFEC4->unk8FE7 = 0; + nextValue = gUnknown_083DFEC4->unk8FE6 + 1; + gUnknown_083DFEC4->unk8FE6 = nextValue; + if ((nextValue & mask) == 14) + break; + } + } + break; + case 14: + var0.unk4 = 1; + var0.unk1 = 14; + for (i = 0; i < gUnknown_083DFEC4->unk8828; i++) + { + if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) + { + var0.partyIdx = i; + var0.unk0 = GetMonData(&gPlayerParty[i], gUnknown_083DFEC4->unk87D8); + sub_80F4944(&var0); + } + } + + sub_80F49F4(); + gUnknown_083DFEC4->unk87DA = gUnknown_083DFEC4->unk8FE4; + gUnknown_083DFEC4->unk8FE6++; + break; + case 15: + return FALSE; + } + + return TRUE; +} + +void sub_80F4F78(void) +{ + sub_80F53EC(gUnknown_083DFEC4->unk9040, gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9]); + sub_80F5504(); +} + +bool8 sub_80F4FB4(void) +{ + bool8 var0 = sub_80F5504(); + bool8 var1 = sub_80F170C(); + return var0 || var1; +} + +void sub_80F4FDC(void) +{ + if (gUnknown_083DFEC4->unk76AA || gUnknown_083DFEC4->unk87DC != gUnknown_083DFEC4->unk8828) + sub_80F53EC(gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9], gUnknown_083DFEC4->unk9040); +} + +bool8 sub_80F5038(void) +{ + bool8 var0 = sub_80F5504(); + bool8 var1 = sub_80F173C(); + return var0 || var1; +} + +void sub_80F5060(u8 arg0) +{ + u16 var0; + u8 var1; + u8 var2; + + if (arg0) + var0 = gUnknown_083DFEC4->unk8FEB; + else + var0 = gUnknown_083DFEC4->unk8FEA; + + sub_80F53EC(gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9], gUnknown_083DFEC4->unk9004[var0]); + var1 = gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk4; + if (arg0) + { + gUnknown_083DFEC4->unk8FEB = gUnknown_083DFEC4->unk8FEA; + gUnknown_083DFEC4->unk8FEA = gUnknown_083DFEC4->unk8fe9; + gUnknown_083DFEC4->unk8fe9 = var0; + gUnknown_083DFEC4->unk8FEC = gUnknown_083DFEC4->unk8FEB; + + gUnknown_083DFEC4->unk87DC = gUnknown_083DFEC4->unk87DC + ? gUnknown_083DFEC4->unk87DC - 1 + : gUnknown_083DFEC4->unk87DA - 1; + gUnknown_083DFEC4->unk8FEE = gUnknown_083DFEC4->unk87DC + ? gUnknown_083DFEC4->unk87DC - 1 + : gUnknown_083DFEC4->unk87DA - 1; + } + else + { + gUnknown_083DFEC4->unk8FEA = gUnknown_083DFEC4->unk8FEB; + gUnknown_083DFEC4->unk8FEB = gUnknown_083DFEC4->unk8fe9; + gUnknown_083DFEC4->unk8fe9 = var0; + gUnknown_083DFEC4->unk8FEC = gUnknown_083DFEC4->unk8FEA; + + gUnknown_083DFEC4->unk87DC = (gUnknown_083DFEC4->unk87DC < gUnknown_083DFEC4->unk87DA - 1) + ? gUnknown_083DFEC4->unk87DC + 1 + : 0; + gUnknown_083DFEC4->unk8FEE = (gUnknown_083DFEC4->unk87DC < gUnknown_083DFEC4->unk87DA - 1) + ? gUnknown_083DFEC4->unk87DC + 1 + : 0; + } + + var2 = gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk4; + if (!var1) + gUnknown_083DFEC4->unk87E0 = sub_80F5264; + else if (!var2) + gUnknown_083DFEC4->unk87E0 = sub_80F52F8; + else + gUnknown_083DFEC4->unk87E0 = sub_80F5364; + + gUnknown_083DFEC4->unk87DE = 0; +} + +bool8 gpu_sync_bg_show(void) +{ + return gUnknown_083DFEC4->unk87E0(); +} + +static bool8 sub_80F5264(void) +{ + switch (gUnknown_083DFEC4->unk87DE) + { + case 0: + sub_80F2E18(gUnknown_083DFEC4->unk8fe9); + sub_80F01E0(gUnknown_083DFEC4->unk8fe9); + gUnknown_083DFEC4->unk87DE++; + // fall through + case 1: + if (!sub_80F4FB4()) + { + sub_80F4900(gUnknown_083DFEC4->unk8FEE, gUnknown_083DFEC4->unk8FEC); + gUnknown_083DFEC4->unk87DE++; + } + break; + case 2: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_80F52F8(void) +{ + switch (gUnknown_083DFEC4->unk87DE) + { + case 0: + if (!sub_80F5038()) + { + sub_80F01E0(gUnknown_083DFEC4->unk8fe9); + sub_80F4900(gUnknown_083DFEC4->unk8FEE, gUnknown_083DFEC4->unk8FEC); + gUnknown_083DFEC4->unk87DE++; + } + break; + case 1: + return FALSE; + } + + return TRUE; +} + +static bool8 sub_80F5364(void) +{ + switch (gUnknown_083DFEC4->unk87DE) + { + case 0: + sub_80F5504(); + if (!sub_80F173C()) + { + sub_80F2E18(gUnknown_083DFEC4->unk8fe9); + sub_80F01E0(gUnknown_083DFEC4->unk8fe9); + gUnknown_083DFEC4->unk87DE++; + } + break; + case 1: + if (!sub_80F4FB4()) + gUnknown_083DFEC4->unk87DE++; + break; + case 2: + sub_80F4900(gUnknown_083DFEC4->unk8FEE, gUnknown_083DFEC4->unk8FEC); + return FALSE; + } + + return TRUE; +} + +static void sub_80F53EC(struct UnkPokenav11 *arg0, struct UnkPokenav11 *arg1) +{ + u16 i, j; + int r5; + int r6; + + for (i = 0; i < 5; i++) + { + r5 = arg0[i].unk0 << 8; + r6 = ((arg1[i].unk0 - arg0[i].unk0) << 8) / 10; + for (j = 0; j < 9; j++) + { + gUnknown_083DFEC4->unk9054[j][i].unk0 = (r5 >> 8) + ((r5 >> 7) & 1); + r5 += r6; + } + + gUnknown_083DFEC4->unk9054[j][i].unk0 = arg1[i].unk0; + r5 = arg0[i].unk2 << 8; + r6 = ((arg1[i].unk2 - arg0[i].unk2) << 8) / 10; + for (j = 0; j < 9; j++) + { + gUnknown_083DFEC4->unk9054[j][i].unk2 = (r5 >> 8) + ((r5 >> 7) & 1); + r5 += r6; + } + + gUnknown_083DFEC4->unk9054[j][i].unk2 = arg1[i].unk2; + } + + gUnknown_083DFEC4->unk9342 = 0; +} + +static bool8 sub_80F5504(void) +{ + if (gUnknown_083DFEC4->unk9342 < 10) + { + sub_80F556C(gUnknown_083DFEC4->unk9054[gUnknown_083DFEC4->unk9342++]); + return gUnknown_083DFEC4->unk9342 != 10; + } + else + { + return FALSE; + } +} + +void sub_80F5550(struct UnkPokenav11 *arg0, struct UnkPokenav11 *arg1) +{ + sub_80F53EC(arg0, arg1); +} + +bool8 sub_80F555C(void) +{ + return sub_80F5504(); +} + +void sub_80F556C(struct UnkPokenav11 *arg0) +{ + u16 i; + + for (i = 0; i < 5; i++) + gUnknown_083DFEC4->unk911C[i] = arg0[i]; + + gUnknown_083DFEC4->unk9344 = 1; +} diff --git a/src/sound.c b/src/sound.c index 5b41acbc6..b9756c1dc 100644 --- a/src/sound.c +++ b/src/sound.c @@ -32,15 +32,8 @@ extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlay_SE2; extern struct MusicPlayerInfo gMPlay_SE3; -extern struct ToneData voicegroup_8452590[]; -extern struct ToneData voicegroup_8452B90[]; -extern struct ToneData voicegroup_8453190[]; -extern struct ToneData voicegroup_8453790[]; - -extern struct ToneData voicegroup_84537C0[]; -extern struct ToneData voicegroup_8453DC0[]; -extern struct ToneData voicegroup_84543C0[]; -extern struct ToneData voicegroup_84549C0[]; +extern struct ToneData gCryTable[]; +extern struct ToneData gCryTable2[]; static const struct Fanfare sFanfares[] = { @@ -416,19 +409,19 @@ static void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode { case 0: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84537C0[index] : &voicegroup_8452590[index]); + v0 ? &gCryTable2[(128 * 0) + index] : &gCryTable[(128 * 0) + index]); break; case 1: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_8453DC0[index] : &voicegroup_8452B90[index]); + v0 ? &gCryTable2[(128 * 1) + index] : &gCryTable[(128 * 1) + index]); break; case 2: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84543C0[index] : &voicegroup_8453190[index]); + v0 ? &gCryTable2[(128 * 2) + index] : &gCryTable[(128 * 2) + index]); break; case 3: gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &voicegroup_84549C0[index] : &voicegroup_8453790[index]); + v0 ? &gCryTable2[(128 * 3) + index] : &gCryTable[(128 * 3) + index]); break; } } diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index dd28bd148..c8506fbcf 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -317,7 +317,7 @@ static void sub_8136294(void) } break; case 19: - sub_80F556C(gUnknown_083DFEC4->unk9004); + sub_80F556C(gUnknown_083DFEC4->unk9004[0]); gUnknown_02039304->unk50++; break; case 20: |