diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/agb_flash.c | 7 | ||||
| -rw-r--r-- | src/battle_anim_water.c | 85 | ||||
| -rw-r--r-- | src/data/pokemon_graphics/back_pic_coordinates.h | 880 | ||||
| -rw-r--r-- | src/data/pokemon_graphics/front_pic_coordinates.h | 880 | ||||
| -rw-r--r-- | src/event_object_movement.c | 2 | ||||
| -rwxr-xr-x | src/faraway_island.c | 191 | ||||
| -rw-r--r-- | src/option_menu.c | 10 | ||||
| -rw-r--r-- | src/pokemon_storage_system.c | 68 |
8 files changed, 1035 insertions, 1088 deletions
diff --git a/src/agb_flash.c b/src/agb_flash.c index a9cf13d5f..1ad9e47ec 100644 --- a/src/agb_flash.c +++ b/src/agb_flash.c @@ -127,7 +127,8 @@ void SetReadFlash1(u16 *dest) } } -void ReadFlash_Core(u8 *src, u8 *dest, u32 size) +// Using volatile here to make sure the flash memory will ONLY be read as bytes, to prevent any compiler optimizations. +void ReadFlash_Core(vu8 *src, u8 *dest, u32 size) { while (size-- != 0) { @@ -142,7 +143,7 @@ void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size) u16 readFlash_Core_Buffer[0x40]; u16 *funcSrc; u16 *funcDest; - void (*readFlash_Core)(u8 *, u8 *, u32); + void (*readFlash_Core)(vu8 *, u8 *, u32); REG_WAITCNT = (REG_WAITCNT & ~WAITCNT_SRAM_MASK) | WAITCNT_SRAM_8; @@ -164,7 +165,7 @@ void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size) i--; } - readFlash_Core = (void (*)(u8 *, u8 *, u32))((s32)readFlash_Core_Buffer + 1); + readFlash_Core = (void (*)(vu8 *, u8 *, u32))((s32)readFlash_Core_Buffer + 1); src = FLASH_BASE + (sectorNum << gFlash->sector.shift) + offset; diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c index 5810b6bdc..88af2cdec 100644 --- a/src/battle_anim_water.c +++ b/src/battle_anim_water.c @@ -624,98 +624,24 @@ void AnimTask_RotateAuroraRingColors(u8 taskId) gTasks[taskId].func = AnimTask_RotateAuroraRingColors_Step; } -#ifdef NONMATCHING static void AnimTask_RotateAuroraRingColors_Step(u8 taskId) { int i; u16 palIndex; - u16 *palPtr1; - u16 *palPtr2; - u16 rgbBuffer; if (++gTasks[taskId].data[10] == 3) { + u16 tempPlt; gTasks[taskId].data[10] = 0; palIndex = gTasks[taskId].data[2] + 1; - palPtr1 = &gPlttBufferFaded[palIndex]; - rgbBuffer = *palPtr1; - palPtr2 = &palPtr1[1]; - for (i = 0; i < 7; i++) - palPtr1[i] = palPtr2[i]; - gPlttBufferFaded[palIndex + 7] = rgbBuffer; + tempPlt = gPlttBufferFaded[palIndex]; + for (i = 1; i < 8; i++) + gPlttBufferFaded[palIndex + i - 1] = gPlttBufferFaded[palIndex + i]; + gPlttBufferFaded[palIndex + 7] = tempPlt; } if (++gTasks[taskId].data[11] == gTasks[taskId].data[0]) DestroyAnimVisualTask(taskId); } -#else -NAKED -static void AnimTask_RotateAuroraRingColors_Step(u8 taskId) -{ - asm_unified("push {r4-r7,lr}\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - ldr r1, =gTasks\n\ - lsls r0, r4, 2\n\ - adds r0, r4\n\ - lsls r0, 3\n\ - adds r2, r0, r1\n\ - ldrh r0, [r2, 0x1C]\n\ - adds r0, 0x1\n\ - strh r0, [r2, 0x1C]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - mov r12, r1\n\ - cmp r0, 0x3\n\ - bne _081075BE\n\ - movs r0, 0\n\ - strh r0, [r2, 0x1C]\n\ - ldrh r0, [r2, 0xC]\n\ - adds r0, 0x1\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - ldr r1, =gPlttBufferFaded\n\ - lsls r0, r5, 1\n\ - adds r0, r1\n\ - ldrh r6, [r0]\n\ - adds r7, r1, 0\n\ - adds r3, r0, 0x2\n\ - movs r1, 0x6\n\ - adds r2, r0, 0\n\ -_081075A8:\n\ - ldrh r0, [r3]\n\ - strh r0, [r2]\n\ - adds r3, 0x2\n\ - adds r2, 0x2\n\ - subs r1, 0x1\n\ - cmp r1, 0\n\ - bge _081075A8\n\ - adds r0, r5, 0x7\n\ - lsls r0, 1\n\ - adds r0, r7\n\ - strh r6, [r0]\n\ -_081075BE:\n\ - lsls r0, r4, 2\n\ - adds r0, r4\n\ - lsls r0, 3\n\ - add r0, r12\n\ - ldrh r1, [r0, 0x1E]\n\ - adds r1, 0x1\n\ - strh r1, [r0, 0x1E]\n\ - lsls r1, 16\n\ - asrs r1, 16\n\ - movs r2, 0x8\n\ - ldrsh r0, [r0, r2]\n\ - cmp r1, r0\n\ - bne _081075DE\n\ - adds r0, r4, 0\n\ - bl DestroyAnimVisualTask\n\ -_081075DE:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n"); -} -#endif // For animating undulating beam attacks (e.g. Flamethrower, Hydro Pump, Signal Beam) static void AnimToTargetInSinWave(struct Sprite *sprite) @@ -822,6 +748,7 @@ static void AnimHydroCannonBeam(struct Sprite *sprite) if (GetBattlerPosition(gBattleAnimAttacker) == B_POSITION_PLAYER_LEFT || GetBattlerPosition(gBattleAnimAttacker) == B_POSITION_OPPONENT_LEFT) gBattleAnimArgs[0] *= -1; } + if ((gBattleAnimArgs[5] & 0xFF00) == 0) animType = TRUE; else diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 0a89f20c8..131ac13d9 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -3,2202 +3,2202 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_NONE] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_BULBASAUR] = { .size = 0x64, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_IVYSAUR] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_VENUSAUR] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_CHARMANDER] = { .size = 0x65, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_CHARMELEON] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_CHARIZARD] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SQUIRTLE] = { .size = 0x65, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_WARTORTLE] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_BLASTOISE] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_CATERPIE] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_METAPOD] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_BUTTERFREE] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_WEEDLE] = { .size = 0x56, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_KAKUNA] = { .size = 0x46, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_BEEDRILL] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_PIDGEY] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_PIDGEOTTO] = { .size = 0x85, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_PIDGEOT] = { .size = 0x78, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_RATTATA] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_RATICATE] = { .size = 0x75, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_SPEAROW] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_FEAROW] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_EKANS] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_ARBOK] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_PIKACHU] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_RAICHU] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SANDSHREW] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_SANDSLASH] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_NIDORAN_F] = { .size = 0x55, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_NIDORINA] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_NIDOQUEEN] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_NIDORAN_M] = { .size = 0x56, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_NIDORINO] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_NIDOKING] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_CLEFAIRY] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_CLEFABLE] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_VULPIX] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_NINETALES] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_JIGGLYPUFF] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_WIGGLYTUFF] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ZUBAT] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_GOLBAT] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_ODDISH] = { .size = 0x56, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_GLOOM] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_VILEPLUME] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_PARAS] = { .size = 0x63, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_PARASECT] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_VENONAT] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_VENOMOTH] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_DIGLETT] = { .size = 0x54, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_DUGTRIO] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_MEOWTH] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_PERSIAN] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_PSYDUCK] = { .size = 0x67, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_GOLDUCK] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_MANKEY] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_PRIMEAPE] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_GROWLITHE] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ARCANINE] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_POLIWAG] = { .size = 0x74, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_POLIWHIRL] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_POLIWRATH] = { .size = 0x86, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_ABRA] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_KADABRA] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ALAKAZAM] = { .size = 0x67, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_MACHOP] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_MACHOKE] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_MACHAMP] = { .size = 0x67, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_BELLSPROUT] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_WEEPINBELL] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_VICTREEBEL] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_TENTACOOL] = { .size = 0x56, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_TENTACRUEL] = { .size = 0x86, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_GEODUDE] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_GRAVELER] = { .size = 0x75, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_GOLEM] = { .size = 0x84, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_PONYTA] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_RAPIDASH] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_SLOWPOKE] = { .size = 0x85, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_SLOWBRO] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_MAGNEMITE] = { .size = 0x43, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_MAGNETON] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_FARFETCHD] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_DODUO] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_DODRIO] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_SEEL] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_DEWGONG] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_GRIMER] = { .size = 0x75, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_MUK] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_SHELLDER] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_CLOYSTER] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_GASTLY] = { .size = 0x85, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_HAUNTER] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_GENGAR] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_ONIX] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_DROWZEE] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_HYPNO] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_KRABBY] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_KINGLER] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_VOLTORB] = { .size = 0x55, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_ELECTRODE] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_EXEGGCUTE] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_EXEGGUTOR] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_CUBONE] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_MAROWAK] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_HITMONLEE] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_HITMONCHAN] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_LICKITUNG] = { .size = 0x65, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_KOFFING] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_WEEZING] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_RHYHORN] = { .size = 0x85, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_RHYDON] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_CHANSEY] = { .size = 0x86, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_TANGELA] = { .size = 0x85, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_KANGASKHAN] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_HORSEA] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_SEADRA] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_GOLDEEN] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SEAKING] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_STARYU] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_STARMIE] = { .size = 0x85, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_MR_MIME] = { .size = 0x85, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_SCYTHER] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_JYNX] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_ELECTABUZZ] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MAGMAR] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_PINSIR] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_TAUROS] = { .size = 0x85, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_MAGIKARP] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_GYARADOS] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_LAPRAS] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_DITTO] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_EEVEE] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_VAPOREON] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_JOLTEON] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_FLAREON] = { .size = 0x67, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_PORYGON] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_OMANYTE] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_OMASTAR] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_KABUTO] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_KABUTOPS] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_AERODACTYL] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SNORLAX] = { .size = 0x86, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_ARTICUNO] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_ZAPDOS] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_MOLTRES] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_DRATINI] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_DRAGONAIR] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_DRAGONITE] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_MEWTWO] = { .size = 0x78, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_MEW] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_CHIKORITA] = { .size = 0x56, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_BAYLEEF] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MEGANIUM] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_CYNDAQUIL] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_QUILAVA] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_TYPHLOSION] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_TOTODILE] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_CROCONAW] = { .size = 0x67, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_FERALIGATR] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_SENTRET] = { .size = 0x67, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_FURRET] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_HOOTHOOT] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_NOCTOWL] = { .size = 0x68, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_LEDYBA] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_LEDIAN] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_SPINARAK] = { .size = 0x73, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_ARIADOS] = { .size = 0x86, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_CROBAT] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_CHINCHOU] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_LANTURN] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_PICHU] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_CLEFFA] = { .size = 0x65, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_IGGLYBUFF] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_TOGEPI] = { .size = 0x54, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_TOGETIC] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_NATU] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_XATU] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MAREEP] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_FLAAFFY] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_AMPHAROS] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_BELLOSSOM] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_MARILL] = { .size = 0x75, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_AZUMARILL] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SUDOWOODO] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_POLITOED] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_HOPPIP] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_SKIPLOOM] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_JUMPLUFF] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_AIPOM] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_SUNKERN] = { .size = 0x56, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SUNFLORA] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_YANMA] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_WOOPER] = { .size = 0x85, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_QUAGSIRE] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ESPEON] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_UMBREON] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_MURKROW] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_SLOWKING] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MISDREAVUS] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_UNOWN] = { .size = 0x36, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_WOBBUFFET] = { .size = 0x75, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_GIRAFARIG] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_PINECO] = { .size = 0x65, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_FORRETRESS] = { .size = 0x84, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_DUNSPARCE] = { .size = 0x85, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_GLIGAR] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_STEELIX] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SNUBBULL] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_GRANBULL] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_QWILFISH] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_SCIZOR] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SHUCKLE] = { .size = 0x56, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_HERACROSS] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SNEASEL] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_TEDDIURSA] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_URSARING] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_SLUGMA] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MAGCARGO] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_SWINUB] = { .size = 0x63, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_PILOSWINE] = { .size = 0x75, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_CORSOLA] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_REMORAID] = { .size = 0x75, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_OCTILLERY] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_DELIBIRD] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_MANTINE] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_SKARMORY] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_HOUNDOUR] = { .size = 0x55, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_HOUNDOOM] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_KINGDRA] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_PHANPY] = { .size = 0x65, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_DONPHAN] = { .size = 0x85, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_PORYGON2] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_STANTLER] = { .size = 0x78, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_SMEARGLE] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_TYROGUE] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_HITMONTOP] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_SMOOCHUM] = { .size = 0x56, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_ELEKID] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MAGBY] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_MILTANK] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_BLISSEY] = { .size = 0x85, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_RAIKOU] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_ENTEI] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_SUICUNE] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_LARVITAR] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_PUPITAR] = { .size = 0x67, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_TYRANITAR] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_LUGIA] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_HO_OH] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_CELEBI] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_OLD_UNOWN_B] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_C] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_D] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_E] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_F] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_G] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_H] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_I] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_J] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_K] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_L] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_M] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_N] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_O] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_P] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_Q] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_R] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_S] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_T] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_U] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_V] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_W] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_X] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_Y] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_Z] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_TREECKO] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_GROVYLE] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SCEPTILE] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_TORCHIC] = { .size = 0x67, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_COMBUSKEN] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_BLAZIKEN] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_MUDKIP] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_MARSHTOMP] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SWAMPERT] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_POOCHYENA] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_MIGHTYENA] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_ZIGZAGOON] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_LINOONE] = { .size = 0x85, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_WURMPLE] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_SILCOON] = { .size = 0x83, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_BEAUTIFLY] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_CASCOON] = { .size = 0x73, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_DUSTOX] = { .size = 0x83, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_LOTAD] = { .size = 0x75, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_LOMBRE] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_LUDICOLO] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SEEDOT] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_NUZLEAF] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SHIFTRY] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_NINCADA] = { .size = 0x83, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_NINJASK] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SHEDINJA] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_TAILLOW] = { .size = 0x64, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_SWELLOW] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SHROOMISH] = { .size = 0x85, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_BRELOOM] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SPINDA] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_WINGULL] = { .size = 0x85, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_PELIPPER] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_SURSKIT] = { .size = 0x86, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_MASQUERAIN] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_WAILMER] = { .size = 0x83, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_WAILORD] = { .size = 0x83, - .y_offset = 0x16, + .y_offset = 22, }, [SPECIES_SKITTY] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_DELCATTY] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_KECLEON] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_BALTOY] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_CLAYDOL] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_NOSEPASS] = { .size = 0x85, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_TORKOAL] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SABLEYE] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_BARBOACH] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_WHISCASH] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_LUVDISC] = { .size = 0x46, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_CORPHISH] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_CRAWDAUNT] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_FEEBAS] = { .size = 0x67, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_MILOTIC] = { .size = 0x68, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_CARVANHA] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_SHARPEDO] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_TRAPINCH] = { .size = 0x75, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_VIBRAVA] = { .size = 0x74, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_FLYGON] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_MAKUHITA] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_HARIYAMA] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_ELECTRIKE] = { .size = 0x84, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_MANECTRIC] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_NUMEL] = { .size = 0x86, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_CAMERUPT] = { .size = 0x84, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_SPHEAL] = { .size = 0x64, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_SEALEO] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_WALREIN] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_CACNEA] = { .size = 0x85, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_CACTURNE] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_SNORUNT] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_GLALIE] = { .size = 0x85, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_LUNATONE] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_SOLROCK] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_AZURILL] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SPOINK] = { .size = 0x56, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_GRUMPIG] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_PLUSLE] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MINUN] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MAWILE] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_MEDITITE] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_MEDICHAM] = { .size = 0x68, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_SWABLU] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_ALTARIA] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_WYNAUT] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_DUSKULL] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_DUSCLOPS] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ROSELIA] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SLAKOTH] = { .size = 0x85, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_VIGOROTH] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SLAKING] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_GULPIN] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_SWALOT] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_TROPIUS] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_WHISMUR] = { .size = 0x85, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_LOUDRED] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_EXPLOUD] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_CLAMPERL] = { .size = 0x85, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_HUNTAIL] = { .size = 0x68, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_GOREBYSS] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_ABSOL] = { .size = 0x78, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_SHUPPET] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_BANETTE] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_SEVIPER] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_ZANGOOSE] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_RELICANTH] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_ARON] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_LAIRON] = { .size = 0x84, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_AGGRON] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_CASTFORM] = { .size = 0x45, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_VOLBEAT] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ILLUMISE] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_LILEEP] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_CRADILY] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_ANORITH] = { .size = 0x83, - .y_offset = 0x17, + .y_offset = 23, }, [SPECIES_ARMALDO] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_RALTS] = { .size = 0x45, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_KIRLIA] = { .size = 0x57, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_GARDEVOIR] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_BAGON] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SHELGON] = { .size = 0x85, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_SALAMENCE] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_BELDUM] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_METANG] = { .size = 0x84, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_METAGROSS] = { .size = 0x83, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_REGIROCK] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_REGICE] = { .size = 0x85, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_REGISTEEL] = { .size = 0x85, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_KYOGRE] = { .size = 0x84, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_GROUDON] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_RAYQUAZA] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_LATIAS] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_LATIOS] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_JIRACHI] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_DEOXYS] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_CHIMECHO] = { .size = 0x47, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_EGG] = { .size = 0x36, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_UNOWN_B] = { .size = 0x56, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_UNOWN_C] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_UNOWN_D] = { .size = 0x56, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_UNOWN_E] = { .size = 0x56, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_UNOWN_F] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_UNOWN_G] = { .size = 0x57, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_UNOWN_H] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_UNOWN_I] = { .size = 0x37, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_UNOWN_J] = { .size = 0x46, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_UNOWN_K] = { .size = 0x57, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_UNOWN_L] = { .size = 0x46, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_UNOWN_M] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_UNOWN_N] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_UNOWN_O] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_UNOWN_P] = { .size = 0x46, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_UNOWN_Q] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_UNOWN_R] = { .size = 0x45, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_UNOWN_S] = { .size = 0x57, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_UNOWN_T] = { .size = 0x45, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_UNOWN_U] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_UNOWN_V] = { .size = 0x56, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_UNOWN_W] = { .size = 0x55, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_UNOWN_X] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_UNOWN_Y] = { .size = 0x46, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_UNOWN_Z] = { .size = 0x46, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_UNOWN_EMARK] = { .size = 0x37, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_UNOWN_QMARK] = { .size = 0x47, - .y_offset = 0x06, + .y_offset = 6, }, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 19de9a7dd..b787877b9 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -3,2201 +3,2201 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_NONE] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_BULBASAUR] = { .size = 0x45, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_IVYSAUR] = { .size = 0x56, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_VENUSAUR] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_CHARMANDER] = { .size = 0x55, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_CHARMELEON] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_CHARIZARD] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_SQUIRTLE] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_WARTORTLE] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_BLASTOISE] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_CATERPIE] = { .size = 0x45, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_METAPOD] = { .size = 0x54, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_BUTTERFREE] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_WEEDLE] = { .size = 0x54, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_KAKUNA] = { .size = 0x45, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_BEEDRILL] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_PIDGEY] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_PIDGEOTTO] = { .size = 0x67, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_PIDGEOT] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_RATTATA] = { .size = 0x44, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_RATICATE] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_SPEAROW] = { .size = 0x45, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_FEAROW] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_EKANS] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_ARBOK] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_PIKACHU] = { .size = 0x67, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_RAICHU] = { .size = 0x67, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SANDSHREW] = { .size = 0x55, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_SANDSLASH] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_NIDORAN_F] = { .size = 0x45, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_NIDORINA] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_NIDOQUEEN] = { .size = 0x78, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_NIDORAN_M] = { .size = 0x55, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_NIDORINO] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_NIDOKING] = { .size = 0x78, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_CLEFAIRY] = { .size = 0x55, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_CLEFABLE] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_VULPIX] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_NINETALES] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_JIGGLYPUFF] = { .size = 0x45, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_WIGGLYTUFF] = { .size = 0x67, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ZUBAT] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_GOLBAT] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_ODDISH] = { .size = 0x45, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_GLOOM] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_VILEPLUME] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_PARAS] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_PARASECT] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_VENONAT] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_VENOMOTH] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_DIGLETT] = { .size = 0x54, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_DUGTRIO] = { .size = 0x75, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_MEOWTH] = { .size = 0x55, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_PERSIAN] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_PSYDUCK] = { .size = 0x56, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_GOLDUCK] = { .size = 0x78, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_MANKEY] = { .size = 0x65, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_PRIMEAPE] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_GROWLITHE] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_ARCANINE] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_POLIWAG] = { .size = 0x74, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_POLIWHIRL] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_POLIWRATH] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ABRA] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_KADABRA] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_ALAKAZAM] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_MACHOP] = { .size = 0x56, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_MACHOKE] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_MACHAMP] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_BELLSPROUT] = { .size = 0x65, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_WEEPINBELL] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_VICTREEBEL] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_TENTACOOL] = { .size = 0x46, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_TENTACRUEL] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_GEODUDE] = { .size = 0x54, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_GRAVELER] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_GOLEM] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_PONYTA] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_RAPIDASH] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_SLOWPOKE] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_SLOWBRO] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MAGNEMITE] = { .size = 0x43, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_MAGNETON] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_FARFETCHD] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_DODUO] = { .size = 0x57, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_DODRIO] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SEEL] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_DEWGONG] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_GRIMER] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_MUK] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SHELLDER] = { .size = 0x55, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_CLOYSTER] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_GASTLY] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_HAUNTER] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_GENGAR] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_ONIX] = { .size = 0x78, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_DROWZEE] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_HYPNO] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_KRABBY] = { .size = 0x65, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_KINGLER] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_VOLTORB] = { .size = 0x44, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_ELECTRODE] = { .size = 0x55, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_EXEGGCUTE] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_EXEGGUTOR] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_CUBONE] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_MAROWAK] = { .size = 0x76, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_HITMONLEE] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_HITMONCHAN] = { .size = 0x67, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_LICKITUNG] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_KOFFING] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_WEEZING] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_RHYHORN] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_RHYDON] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_CHANSEY] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_TANGELA] = { .size = 0x67, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_KANGASKHAN] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_HORSEA] = { .size = 0x45, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_SEADRA] = { .size = 0x67, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_GOLDEEN] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SEAKING] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_STARYU] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_STARMIE] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_MR_MIME] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SCYTHER] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_JYNX] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_ELECTABUZZ] = { .size = 0x78, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_MAGMAR] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_PINSIR] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_TAUROS] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_MAGIKARP] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_GYARADOS] = { .size = 0x88, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_LAPRAS] = { .size = 0x85, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_DITTO] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_EEVEE] = { .size = 0x56, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_VAPOREON] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_JOLTEON] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_FLAREON] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_PORYGON] = { .size = 0x55, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_OMANYTE] = { .size = 0x45, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_OMASTAR] = { .size = 0x67, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_KABUTO] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_KABUTOPS] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_AERODACTYL] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_SNORLAX] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_ARTICUNO] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_ZAPDOS] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_MOLTRES] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_DRATINI] = { .size = 0x75, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_DRAGONAIR] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_DRAGONITE] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_MEWTWO] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_MEW] = { .size = 0x55, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_CHIKORITA] = { .size = 0x75, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_BAYLEEF] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_MEGANIUM] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_CYNDAQUIL] = { .size = 0x55, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_QUILAVA] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_TYPHLOSION] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_TOTODILE] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_CROCONAW] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_FERALIGATR] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SENTRET] = { .size = 0x47, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_FURRET] = { .size = 0x67, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_HOOTHOOT] = { .size = 0x55, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_NOCTOWL] = { .size = 0x58, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_LEDYBA] = { .size = 0x56, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_LEDIAN] = { .size = 0x67, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SPINARAK] = { .size = 0x54, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_ARIADOS] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_CROBAT] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_CHINCHOU] = { .size = 0x75, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_LANTURN] = { .size = 0x87, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_PICHU] = { .size = 0x45, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_CLEFFA] = { .size = 0x44, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_IGGLYBUFF] = { .size = 0x44, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_TOGEPI] = { .size = 0x34, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_TOGETIC] = { .size = 0x46, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_NATU] = { .size = 0x44, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_XATU] = { .size = 0x47, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_MAREEP] = { .size = 0x55, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_FLAAFFY] = { .size = 0x56, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_AMPHAROS] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_BELLOSSOM] = { .size = 0x45, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_MARILL] = { .size = 0x65, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_AZUMARILL] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_SUDOWOODO] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_POLITOED] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_HOPPIP] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SKIPLOOM] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_JUMPLUFF] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_AIPOM] = { .size = 0x58, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_SUNKERN] = { .size = 0x44, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_SUNFLORA] = { .size = 0x56, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_YANMA] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_WOOPER] = { .size = 0x54, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_QUAGSIRE] = { .size = 0x77, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_ESPEON] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_UMBREON] = { .size = 0x67, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MURKROW] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_SLOWKING] = { .size = 0x58, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_MISDREAVUS] = { .size = 0x55, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_UNOWN] = { .size = 0x35, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_WOBBUFFET] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_GIRAFARIG] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_PINECO] = { .size = 0x56, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_FORRETRESS] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_DUNSPARCE] = { .size = 0x74, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_GLIGAR] = { .size = 0x78, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_STEELIX] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SNUBBULL] = { .size = 0x55, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_GRANBULL] = { .size = 0x57, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_QWILFISH] = { .size = 0x56, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SCIZOR] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SHUCKLE] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_HERACROSS] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_SNEASEL] = { .size = 0x67, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_TEDDIURSA] = { .size = 0x45, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_URSARING] = { .size = 0x78, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_SLUGMA] = { .size = 0x45, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_MAGCARGO] = { .size = 0x57, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_SWINUB] = { .size = 0x43, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_PILOSWINE] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_CORSOLA] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_REMORAID] = { .size = 0x55, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_OCTILLERY] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_DELIBIRD] = { .size = 0x56, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MANTINE] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_SKARMORY] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_HOUNDOUR] = { .size = 0x56, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_HOUNDOOM] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_KINGDRA] = { .size = 0x78, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_PHANPY] = { .size = 0x54, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_DONPHAN] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_PORYGON2] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_STANTLER] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SMEARGLE] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_TYROGUE] = { .size = 0x46, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_HITMONTOP] = { .size = 0x67, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_SMOOCHUM] = { .size = 0x35, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_ELEKID] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_MAGBY] = { .size = 0x45, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_MILTANK] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_BLISSEY] = { .size = 0x77, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_RAIKOU] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_ENTEI] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SUICUNE] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_LARVITAR] = { .size = 0x46, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_PUPITAR] = { .size = 0x56, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_TYRANITAR] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_LUGIA] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_HO_OH] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_CELEBI] = { .size = 0x55, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_OLD_UNOWN_B] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_C] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_D] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_E] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_F] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_G] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_H] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_I] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_J] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_K] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_L] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_M] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_N] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_O] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_P] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_Q] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_R] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_S] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_T] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_U] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_V] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_W] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_X] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_Y] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_Z] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_TREECKO] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_GROVYLE] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SCEPTILE] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_TORCHIC] = { .size = 0x56, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_COMBUSKEN] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_BLAZIKEN] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_MUDKIP] = { .size = 0x56, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_MARSHTOMP] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_SWAMPERT] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_POOCHYENA] = { .size = 0x55, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_MIGHTYENA] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_ZIGZAGOON] = { .size = 0x85, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_LINOONE] = { .size = 0x78, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_WURMPLE] = { .size = 0x45, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_SILCOON] = { .size = 0x75, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_BEAUTIFLY] = { .size = 0x86, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_CASCOON] = { .size = 0x74, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_DUSTOX] = { .size = 0x86, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_LOTAD] = { .size = 0x65, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_LOMBRE] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_LUDICOLO] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SEEDOT] = { .size = 0x46, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_NUZLEAF] = { .size = 0x56, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SHIFTRY] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_NINCADA] = { .size = 0x74, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_NINJASK] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SHEDINJA] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_TAILLOW] = { .size = 0x64, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_SWELLOW] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_SHROOMISH] = { .size = 0x54, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_BRELOOM] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SPINDA] = { .size = 0x68, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_WINGULL] = { .size = 0x84, - .y_offset = 0x18, + .y_offset = 24, }, [SPECIES_PELIPPER] = { .size = 0x77, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_SURSKIT] = { .size = 0x65, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_MASQUERAIN] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_WAILMER] = { .size = 0x75, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_WAILORD] = { .size = 0x87, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_SKITTY] = { .size = 0x66, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_DELCATTY] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_KECLEON] = { .size = 0x67, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_BALTOY] = { .size = 0x55, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_CLAYDOL] = { .size = 0x78, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_NOSEPASS] = { .size = 0x56, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_TORKOAL] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_SABLEYE] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_BARBOACH] = { .size = 0x46, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_WHISCASH] = { .size = 0x76, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_LUVDISC] = { .size = 0x46, - .y_offset = 0x18, + .y_offset = 24, }, [SPECIES_CORPHISH] = { .size = 0x66, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_CRAWDAUNT] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_FEEBAS] = { .size = 0x46, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_MILOTIC] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_CARVANHA] = { .size = 0x67, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_SHARPEDO] = { .size = 0x78, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_TRAPINCH] = { .size = 0x54, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_VIBRAVA] = { .size = 0x86, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_FLYGON] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_MAKUHITA] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_HARIYAMA] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_ELECTRIKE] = { .size = 0x64, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_MANECTRIC] = { .size = 0x67, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_NUMEL] = { .size = 0x65, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_CAMERUPT] = { .size = 0x87, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_SPHEAL] = { .size = 0x65, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_SEALEO] = { .size = 0x86, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_WALREIN] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_CACNEA] = { .size = 0x74, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_CACTURNE] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SNORUNT] = { .size = 0x56, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_GLALIE] = { .size = 0x76, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_LUNATONE] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_SOLROCK] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_AZURILL] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_SPOINK] = { .size = 0x46, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_GRUMPIG] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_PLUSLE] = { .size = 0x56, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_MINUN] = { .size = 0x66, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_MAWILE] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_MEDITITE] = { .size = 0x65, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_MEDICHAM] = { .size = 0x68, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_SWABLU] = { .size = 0x76, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_ALTARIA] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_WYNAUT] = { .size = 0x55, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_DUSKULL] = { .size = 0x66, - .y_offset = 0x0a, + .y_offset = 10, }, [SPECIES_DUSCLOPS] = { .size = 0x77, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_ROSELIA] = { .size = 0x76, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_SLAKOTH] = { .size = 0x74, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_VIGOROTH] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SLAKING] = { .size = 0x86, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_GULPIN] = { .size = 0x55, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_SWALOT] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_TROPIUS] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_WHISMUR] = { .size = 0x55, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_LOUDRED] = { .size = 0x78, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_EXPLOUD] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_CLAMPERL] = { .size = 0x55, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_HUNTAIL] = { .size = 0x78, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_GOREBYSS] = { .size = 0x86, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_ABSOL] = { .size = 0x68, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_SHUPPET] = { .size = 0x56, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_BANETTE] = { .size = 0x55, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_SEVIPER] = { .size = 0x77, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ZANGOOSE] = { .size = 0x87, - .y_offset = 0x05, + .y_offset = 5, }, [SPECIES_RELICANTH] = { .size = 0x77, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_ARON] = { .size = 0x43, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_LAIRON] = { .size = 0x75, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_AGGRON] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_CASTFORM] = { .size = 0x34, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_VOLBEAT] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ILLUMISE] = { .size = 0x56, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_LILEEP] = { .size = 0x67, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_CRADILY] = { .size = 0x78, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_ANORITH] = { .size = 0x66, - .y_offset = 0x08, + .y_offset = 8, }, [SPECIES_ARMALDO] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_RALTS] = { .size = 0x35, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_KIRLIA] = { .size = 0x47, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_GARDEVOIR] = { .size = 0x78, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_BAGON] = { .size = 0x56, - .y_offset = 0x0b, + .y_offset = 11, }, [SPECIES_SHELGON] = { .size = 0x66, - .y_offset = 0x09, + .y_offset = 9, }, [SPECIES_SALAMENCE] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_BELDUM] = { .size = 0x55, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_METANG] = { .size = 0x87, - .y_offset = 0x07, + .y_offset = 7, }, [SPECIES_METAGROSS] = { .size = 0x87, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_REGIROCK] = { .size = 0x78, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_REGICE] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_REGISTEEL] = { .size = 0x88, - .y_offset = 0x03, + .y_offset = 3, }, [SPECIES_KYOGRE] = { .size = 0x87, - .y_offset = 0x04, + .y_offset = 4, }, [SPECIES_GROUDON] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_RAYQUAZA] = { .size = 0x88, - .y_offset = 0x00, + .y_offset = 0, }, [SPECIES_LATIAS] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_LATIOS] = { .size = 0x88, - .y_offset = 0x02, + .y_offset = 2, }, [SPECIES_JIRACHI] = { .size = 0x66, - .y_offset = 0x0d, + .y_offset = 13, }, [SPECIES_DEOXYS] = { .size = 0x88, - .y_offset = 0x01, + .y_offset = 1, }, [SPECIES_CHIMECHO] = { .size = 0x37, - .y_offset = 0x06, + .y_offset = 6, }, [SPECIES_EGG] = { .size = 0x33, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_UNOWN_B] = { .size = 0x34, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_UNOWN_C] = { .size = 0x44, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_UNOWN_D] = { .size = 0x44, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_UNOWN_E] = { .size = 0x44, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_F] = { .size = 0x44, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_G] = { .size = 0x35, - .y_offset = 0x0e, + .y_offset = 14, }, [SPECIES_UNOWN_H] = { .size = 0x44, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_UNOWN_I] = { .size = 0x34, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_UNOWN_J] = { .size = 0x34, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_K] = { .size = 0x44, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_L] = { .size = 0x34, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_M] = { .size = 0x44, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_N] = { .size = 0x43, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_UNOWN_O] = { .size = 0x44, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_UNOWN_P] = { .size = 0x34, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_Q] = { .size = 0x43, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_UNOWN_R] = { .size = 0x34, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_S] = { .size = 0x45, - .y_offset = 0x0c, + .y_offset = 12, }, [SPECIES_UNOWN_T] = { .size = 0x34, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_UNOWN_U] = { .size = 0x44, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_UNOWN_V] = { .size = 0x44, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_UNOWN_W] = { .size = 0x44, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_X] = { .size = 0x33, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_UNOWN_Y] = { .size = 0x34, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_Z] = { .size = 0x34, - .y_offset = 0x10, + .y_offset = 16, }, [SPECIES_UNOWN_EMARK] = { .size = 0x35, - .y_offset = 0x0f, + .y_offset = 15, }, [SPECIES_UNOWN_QMARK] = { .size = 0x35, - .y_offset = 0x0d, + .y_offset = 13, }, }; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 043d759d7..552f0ce3d 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -8127,7 +8127,7 @@ static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite * { u8 i; - if (ObjectEventIsFarawayIslandMew(objEvent) == TRUE && !sub_81D4A58(objEvent)) + if (ObjectEventIsFarawayIslandMew(objEvent) == TRUE && !ShouldMewShakeGrass(objEvent)) return; for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1) diff --git a/src/faraway_island.c b/src/faraway_island.c index a17ae9394..e3d8444c9 100755 --- a/src/faraway_island.c +++ b/src/faraway_island.c @@ -10,15 +10,15 @@ #include "constants/maps.h" #include "constants/metatile_behaviors.h" -static u8 sub_81D4890(u8); -static bool8 sub_81D4C14(struct ObjectEvent*, u8); -static u8 sub_81D4C9C(struct ObjectEvent*, u8); -static u8 sub_81D4C58(struct ObjectEvent*, u8); -static u8 sub_81D4CE0(struct ObjectEvent*, u8); -static u8 sub_81D4D24(u8); -static bool8 CanMewWalkToCoords(s16, s16); +static u8 GetValidMewMoveDirection(u8); +static bool8 ShouldMewMoveNorth(struct ObjectEvent*, u8); +static bool8 ShouldMewMoveSouth(struct ObjectEvent*, u8); +static bool8 ShouldMewMoveEast(struct ObjectEvent*, u8); +static bool8 ShouldMewMoveWest(struct ObjectEvent*, u8); +static u8 GetRandomMewDirectionCandidate(u8); +static bool8 CanMewMoveToCoords(s16, s16); -static EWRAM_DATA u8 sUnknown_0203CF50 = 0; +static EWRAM_DATA u8 sGrassSpriteId = 0; static s16 sPlayerToMewDeltaX; static s16 sPlayerToMewDeltaY; @@ -29,10 +29,10 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; static const s16 sFarawayIslandRockCoords[4][2] = { - {21, 16}, - {25, 16}, - {16, 17}, - {20, 20}, + {14 + 7, 9 + 7}, + {18 + 7, 9 + 7}, + { 9 + 7, 10 + 7}, + {13 + 7, 13 + 7}, }; static u8 GetMewObjectEventId(void) @@ -42,10 +42,12 @@ static u8 GetMewObjectEventId(void) return objectEventId; } +// When the player enters Faraway Island interior it begins a "hide and seek" minigame where Mew disappears into the grass +// This function returns the direction Mew will take a step, and is run every time the player takes a step u32 GetMewMoveDirection(void) { u8 i; - int skip; + int mewSafeFromTrap; struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; sPlayerToMewDeltaX = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x - mew->currentCoords.x; @@ -53,43 +55,47 @@ u32 GetMewMoveDirection(void) for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) sMewDirectionCandidates[i] = DIR_NONE; + // Player hasn't moved (just facing new direction), don't move if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x && gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y) { return DIR_NONE; } + // Mew is invisible except for every 8th step if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 8 == 0) - mew->invisible = 0; + mew->invisible = FALSE; else - mew->invisible = 1; + mew->invisible = TRUE; + // Mew will stay in place for 1 step after its visible if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 9 == 0) return DIR_NONE; + // Below loop is for Mew to try to avoid getting trapped between the player and a rock for (i = 0; i < ARRAY_COUNT(sFarawayIslandRockCoords); i++) { if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == sFarawayIslandRockCoords[i][0]) { - skip = 0; + mewSafeFromTrap = FALSE; if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y < sFarawayIslandRockCoords[i][1]) { if (mew->currentCoords.y <= sFarawayIslandRockCoords[i][1]) - skip = 1; + mewSafeFromTrap = TRUE; } else { if (mew->currentCoords.y >= sFarawayIslandRockCoords[i][1]) - skip = 1; + mewSafeFromTrap = TRUE; } - if (!skip) + if (!mewSafeFromTrap) { if (sPlayerToMewDeltaX > 0) { if (mew->currentCoords.x + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { - if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) + if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; } } @@ -97,7 +103,7 @@ u32 GetMewMoveDirection(void) { if (mew->currentCoords.x - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { - if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) + if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } } @@ -106,12 +112,12 @@ u32 GetMewMoveDirection(void) { if (sPlayerToMewDeltaY > 0) { - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; } else { - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; } } @@ -120,25 +126,25 @@ u32 GetMewMoveDirection(void) if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == sFarawayIslandRockCoords[i][1]) { - skip = 0; + mewSafeFromTrap = FALSE; if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x < sFarawayIslandRockCoords[i][0]) { if (mew->currentCoords.x <= sFarawayIslandRockCoords[i][0]) - skip = 1; + mewSafeFromTrap = TRUE; } else { if (mew->currentCoords.x >= sFarawayIslandRockCoords[i][0]) - skip = 1; + mewSafeFromTrap = TRUE; } - if (!skip) + if (!mewSafeFromTrap) { if (sPlayerToMewDeltaY > 0) { if (mew->currentCoords.y + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; } } @@ -146,7 +152,7 @@ u32 GetMewMoveDirection(void) { if (mew->currentCoords.y - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; } } @@ -155,12 +161,12 @@ u32 GetMewMoveDirection(void) { if (sPlayerToMewDeltaX > 0) { - if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) + if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } else { - if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) + if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; } } @@ -168,92 +174,101 @@ u32 GetMewMoveDirection(void) } } - if (sub_81D4C14(mew, 0)) + // Check if Mew can move in any direction without getting closer to the player + // If so load into sMewDirectionCandidates + // If Mew can move in two of the checked directions, choose one randomly + if (ShouldMewMoveNorth(mew, 0)) { - if (sub_81D4C58(mew, 1)) - return sub_81D4D24(2); - else if (sub_81D4CE0(mew, 1)) - return sub_81D4D24(2); + if (ShouldMewMoveEast(mew, 1)) + return GetRandomMewDirectionCandidate(2); + else if (ShouldMewMoveWest(mew, 1)) + return GetRandomMewDirectionCandidate(2); else return DIR_NORTH; } - if (sub_81D4C9C(mew, 0)) + if (ShouldMewMoveSouth(mew, 0)) { - if (sub_81D4C58(mew, 1)) - return sub_81D4D24(2); - else if (sub_81D4CE0(mew, 1)) - return sub_81D4D24(2); + if (ShouldMewMoveEast(mew, 1)) + return GetRandomMewDirectionCandidate(2); + else if (ShouldMewMoveWest(mew, 1)) + return GetRandomMewDirectionCandidate(2); else return DIR_SOUTH; } - if (sub_81D4C58(mew, 0)) + if (ShouldMewMoveEast(mew, 0)) { - if (sub_81D4C14(mew, 1)) - return sub_81D4D24(2); - else if (sub_81D4C9C(mew, 1)) - return sub_81D4D24(2); + if (ShouldMewMoveNorth(mew, 1)) + return GetRandomMewDirectionCandidate(2); + else if (ShouldMewMoveSouth(mew, 1)) + return GetRandomMewDirectionCandidate(2); else return DIR_EAST; } - if (sub_81D4CE0(mew, 0)) + if (ShouldMewMoveWest(mew, 0)) { - if (sub_81D4C14(mew, 1)) - return sub_81D4D24(2); - else if (sub_81D4C9C(mew, 1)) - return sub_81D4D24(2); + if (ShouldMewMoveNorth(mew, 1)) + return GetRandomMewDirectionCandidate(2); + else if (ShouldMewMoveSouth(mew, 1)) + return GetRandomMewDirectionCandidate(2); else return DIR_WEST; } + // If this point is reached, Mew cannot move without getting closer to the player + + // Avoid player on same Y, try move North/South if (sPlayerToMewDeltaY == 0) { if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y > mew->currentCoords.y) { - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; } if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y < mew->currentCoords.y) { - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; } - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; } + // Avoid player on same X, try move West/East if (sPlayerToMewDeltaX == 0) { if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x > mew->currentCoords.x) { - if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) + if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x < mew->currentCoords.x) { - if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) + if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; } - if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) + if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; - if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) + if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } - return sub_81D4890(DIR_NONE); + // Can't avoid player on axis, move any valid direction + return GetValidMewMoveDirection(DIR_NONE); } -static bool8 CanMewWalkToCoords(s16 x, s16 y) +// Mew can move to any Tall/Long Grass metatile the player isn't currently on +static bool8 CanMewMoveToCoords(s16 x, s16 y) { if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x == x && gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y == y) @@ -264,7 +279,8 @@ static bool8 CanMewWalkToCoords(s16 x, s16 y) return MetatileBehavior_IsPokeGrass(MapGridGetMetatileBehaviorAt(x, y)); } -static u8 sub_81D4890(u8 ignoredDir) +// Last ditch effort to move, clear move candidates and try all directions again +static u8 GetValidMewMoveDirection(u8 ignoredDir) { u8 i; u8 count = 0; @@ -273,25 +289,25 @@ static u8 sub_81D4890(u8 ignoredDir) for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) sMewDirectionCandidates[i] = DIR_NONE; - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1) == TRUE && ignoredDir != DIR_NORTH) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1) == TRUE && ignoredDir != DIR_NORTH) { sMewDirectionCandidates[count] = DIR_NORTH; count++; } - if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_EAST) + if (CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_EAST) { sMewDirectionCandidates[count] = DIR_EAST; count++; } - if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1) == TRUE && ignoredDir != DIR_SOUTH) + if (CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1) == TRUE && ignoredDir != DIR_SOUTH) { sMewDirectionCandidates[count] = DIR_SOUTH; count++; } - if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_WEST) + if (CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y) == TRUE && ignoredDir != DIR_WEST) { sMewDirectionCandidates[count] = DIR_WEST; count++; @@ -341,7 +357,9 @@ bool8 IsMewPlayingHideAndSeek(void) return FALSE; } -bool8 sub_81D4A58(struct ObjectEvent *objectEvent) +// Every 4th step Mew will shake the grass it steps into +// Otherwise its movement leaves grass undisturbed +bool8 ShouldMewShakeGrass(struct ObjectEvent *objectEvent) { if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF && VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0) @@ -350,22 +368,25 @@ bool8 sub_81D4A58(struct ObjectEvent *objectEvent) return FALSE; } -void sub_81D4A90(void) +void SetMewAboveGrass(void) { s16 x; s16 y; u8 spriteId; struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; - mew->invisible = 0; + mew->invisible = FALSE; if (gSpecialVar_0x8004 == 1) { + // For after battle where Mew should still be present (e.g. if ran from battle) mew->fixedPriority = 1; gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY; gSprites[mew->spriteId].subpriority = 1; } else { + // Mew emerging from grass when found + // Also do field effect for grass shaking as it emerges VarSet(VAR_FARAWAY_ISLAND_STEP_COUNTER, 0xFFFF); mew->fixedPriority = 1; gSprites[mew->spriteId].subspriteMode = SUBSPRITES_IGNORE_PRIORITY; @@ -378,10 +399,10 @@ void sub_81D4A90(void) x = mew->currentCoords.x; y = mew->currentCoords.y; SetSpritePosToOffsetMapCoords(&x, &y, 8, 8); - sUnknown_0203CF50 = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_LONG_GRASS], x, y, gSprites[mew->spriteId].subpriority - 1); - if (sUnknown_0203CF50 != MAX_SPRITES) + sGrassSpriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_LONG_GRASS], x, y, gSprites[mew->spriteId].subpriority - 1); + if (sGrassSpriteId != MAX_SPRITES) { - struct Sprite *sprite = &gSprites[sUnknown_0203CF50]; + struct Sprite *sprite = &gSprites[sGrassSpriteId]; sprite->coordOffsetEnabled = 1; sprite->oam.priority = 2; sprite->callback = SpriteCallbackDummy; @@ -389,15 +410,15 @@ void sub_81D4A90(void) } } -void sub_81D4BEC(void) +void DestroyMewEmergingGrassSprite(void) { - if (sUnknown_0203CF50 != MAX_SPRITES) - DestroySprite(&gSprites[sUnknown_0203CF50]); + if (sGrassSpriteId != MAX_SPRITES) + DestroySprite(&gSprites[sGrassSpriteId]); } -static bool8 sub_81D4C14(struct ObjectEvent *mew, u8 index) +static bool8 ShouldMewMoveNorth(struct ObjectEvent *mew, u8 index) { - if (sPlayerToMewDeltaY > 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) + if (sPlayerToMewDeltaY > 0 && CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) { sMewDirectionCandidates[index] = DIR_NORTH; return TRUE; @@ -406,9 +427,9 @@ static bool8 sub_81D4C14(struct ObjectEvent *mew, u8 index) return FALSE; } -static u8 sub_81D4C58(struct ObjectEvent *mew, u8 index) +static bool8 ShouldMewMoveEast(struct ObjectEvent *mew, u8 index) { - if (sPlayerToMewDeltaX < 0 && CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) + if (sPlayerToMewDeltaX < 0 && CanMewMoveToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) { sMewDirectionCandidates[index] = DIR_EAST; return TRUE; @@ -417,9 +438,9 @@ static u8 sub_81D4C58(struct ObjectEvent *mew, u8 index) return FALSE; } -static u8 sub_81D4C9C(struct ObjectEvent *mew, u8 index) +static bool8 ShouldMewMoveSouth(struct ObjectEvent *mew, u8 index) { - if (sPlayerToMewDeltaY < 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) + if (sPlayerToMewDeltaY < 0 && CanMewMoveToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) { sMewDirectionCandidates[index] = DIR_SOUTH; return TRUE; @@ -428,9 +449,9 @@ static u8 sub_81D4C9C(struct ObjectEvent *mew, u8 index) return FALSE; } -static u8 sub_81D4CE0(struct ObjectEvent *mew, u8 index) +static bool8 ShouldMewMoveWest(struct ObjectEvent *mew, u8 index) { - if (sPlayerToMewDeltaX > 0 && CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) + if (sPlayerToMewDeltaX > 0 && CanMewMoveToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) { sMewDirectionCandidates[index] = DIR_WEST; return TRUE; @@ -439,7 +460,7 @@ static u8 sub_81D4CE0(struct ObjectEvent *mew, u8 index) return FALSE; } -static u8 sub_81D4D24(u8 mod) +static u8 GetRandomMewDirectionCandidate(u8 numDirections) { - return sMewDirectionCandidates[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % mod]; + return sMewDirectionCandidates[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % numDirections]; } diff --git a/src/option_menu.c b/src/option_menu.c index e0473b5c3..1cf0bad2e 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -77,11 +77,9 @@ static void DrawTextOption(void); static void DrawOptionMenuTexts(void); static void sub_80BB154(void); -// EWRAM vars EWRAM_DATA static bool8 sArrowPressed = FALSE; -// const rom data -static const u16 sUnknown_0855C604[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal"); +static const u16 sOptionMenuText_Pal[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal"); // note: this is only used in the Japanese release static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp"); @@ -141,7 +139,7 @@ static const struct BgTemplate sOptionMenuBgTemplates[] = } }; -static const u16 sUnknown_0855C6A0[] = {0x7E51}; +static const u16 sOptionMenuBg_Pal[] = {RGB(17, 18, 31)}; // code static void MainCB2(void) @@ -209,12 +207,12 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 4: - LoadPalette(sUnknown_0855C6A0, 0, sizeof(sUnknown_0855C6A0)); + LoadPalette(sOptionMenuBg_Pal, 0, sizeof(sOptionMenuBg_Pal)); LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 0x70, 0x20); gMain.state++; break; case 5: - LoadPalette(sUnknown_0855C604, 0x10, sizeof(sUnknown_0855C604)); + LoadPalette(sOptionMenuText_Pal, 16, sizeof(sOptionMenuText_Pal)); gMain.state++; break; case 6: diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 31cb47965..59dc0acce 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -128,7 +128,7 @@ struct PokemonStorageSystemData u16 field_B0[528 / 2]; u16 field_2C0; u16 field_2C2; - u8 field_2C4; + u8 field_2C4; // Unused u8 field_2C5; u8 showPartyMenuState; u8 unk_02C7; @@ -136,21 +136,21 @@ struct PokemonStorageSystemData bool8 unk_02C9; s16 newCurrBoxId; u16 bg2_X; - s16 field_2CE; + s16 wallpaperScrollSpeed; u16 field_2D0; u8 field_2D2; - u8 field_2D3; - u8 field_2D4; - u16 field_2D6; - s16 field_2D8; - u16 field_2DA; - u16 field_2DC; - u16 field_2DE; - u16 field_2E0; + u8 field_2D3; // Written to, but never read. + u8 field_2D4; // Written to, but never read. + u16 field_2D6; // Written to, but never read. + s16 field_2D8; // Written to, but never read. + u16 field_2DA; // Written to, but never read. + u16 field_2DC; // Written to, but never read. + u16 field_2DE; // Written to, but never read. + u16 field_2E0; // Written to, but never read. u8 filler[22]; u8 field_2F8[1024]; u8 field_6F8; - u8 field_6F9; + u8 field_6F9; // Written to, but never read. u8 field_6FA; s8 field_6FB; u16 field_6FC[16]; @@ -160,14 +160,14 @@ struct PokemonStorageSystemData struct Sprite *field_728[2]; struct Sprite *field_730[2]; u32 field_738; - u8 field_73C[80]; - u16 field_78C; + u8 field_73C[80]; // Unused + u16 field_78C; // Written to, but never read. s16 wallpaperSetId; s16 wallpaperId; u16 field_792[360]; u8 wallpaperChangeState; u8 field_A63; - u8 field_A64; + u8 boxScrollDestination; s8 field_A65; u8 *wallpaperTiles; struct Sprite *movingMonSprite; @@ -189,12 +189,12 @@ struct PokemonStorageSystemData u8 field_C68; s8 field_C69; u8 field_C6A; - u8 field_C6B; + u8 field_C6B; // Written to, but never read. struct WindowTemplate menuWindow; struct StorageMenu menuItems[7]; u8 menuItemsCount; u8 menuWidth; - u8 field_CAE; + u8 field_CAE; // Written to, but never read. u16 field_CB0; struct Sprite *field_CB4; struct Sprite *field_CB8; @@ -247,7 +247,7 @@ struct PokemonStorageSystemData u16 field_2176[8]; u8 field_2186; u8 field_2187; - u8 field_2188; + u8 pokemonSummaryScreenMode; union { struct Pokemon *mon; @@ -262,13 +262,13 @@ struct PokemonStorageSystemData struct UnkStorageStruct field_2204[3]; u16 movingItem; u16 field_2236; - u8 field_2238; + u8 field_2238; // Unused u16 field_223A; u16 *field_223C; struct Sprite *cursorMonSprite; u16 field_2244[0x40]; u8 field_22C4[0x800]; - u8 field_2AC4[0x1800]; + u8 field_2AC4[0x1800]; // Unused u8 field_42C4[0x800]; u8 field_4AC4[0x1000]; u8 field_5AC4[0x800]; @@ -658,7 +658,7 @@ static void SetBoxSpeciesAndPersonalities(u8 boxId); static void sub_80CB9D0(struct Sprite *sprite, u16 partyId); static void sub_80CC370(u8 taskId); static void sub_80CCB50(u8 boxId); -static s8 sub_80CC644(u8 boxId); +static s8 DetermineBoxScrollDirection(u8 boxId); static void sub_80CCA3C(const void *tilemap, s8 direction, u8 arg2); static s16 sub_80CD00C(const u8 *string); static bool8 MonPlaceChange_Shift(void); @@ -3879,7 +3879,7 @@ static void Cb_ChangeScreen(u8 taskId) boxMons = sPSSData->field_218C.box; monIndex = sPSSData->field_2187; maxMonIndex = sPSSData->field_2186; - mode = sPSSData->field_2188; + mode = sPSSData->pokemonSummaryScreenMode; FreePSSData(); if (mode == PSS_MODE_NORMAL && boxMons == &gUnknown_02039D14.box) ShowPokemonSummaryScreenSet40EF(mode, boxMons, monIndex, maxMonIndex, Cb2_ReturnToPSS); @@ -5276,9 +5276,9 @@ static void sub_80CC370(u8 taskId) static void SetUpScrollToBox(u8 boxId) { - s8 direction = sub_80CC644(boxId); + s8 direction = DetermineBoxScrollDirection(boxId); - sPSSData->field_2CE = (direction > 0) ? 6 : -6; + sPSSData->wallpaperScrollSpeed = (direction > 0) ? 6 : -6; sPSSData->field_2D3 = (direction > 0) ? 1 : 2; sPSSData->field_2D0 = 32; sPSSData->field_2D4 = boxId; @@ -5288,7 +5288,7 @@ static void SetUpScrollToBox(u8 boxId) sPSSData->field_2DC = (direction <= 0) ? 5 : 0; sPSSData->field_2DE = 0; sPSSData->field_2E0 = 2; - sPSSData->field_A64 = boxId; + sPSSData->boxScrollDestination = boxId; sPSSData->field_A65 = direction; sPSSData->field_A63 = 0; } @@ -5300,21 +5300,21 @@ static bool8 ScrollToBox(void) switch (sPSSData->field_A63) { case 0: - LoadWallpaperGfx(sPSSData->field_A64, sPSSData->field_A65); + LoadWallpaperGfx(sPSSData->boxScrollDestination, sPSSData->field_A65); sPSSData->field_A63++; case 1: if (!WaitForWallpaperGfxLoad()) return TRUE; - sub_80CB4CC(sPSSData->field_A64, sPSSData->field_A65); - sub_80CCCFC(sPSSData->field_A64, sPSSData->field_A65); + sub_80CB4CC(sPSSData->boxScrollDestination, sPSSData->field_A65); + sub_80CCCFC(sPSSData->boxScrollDestination, sPSSData->field_A65); sub_80CD0B8(sPSSData->field_A65); break; case 2: var = sub_80CB584(); if (sPSSData->field_2D0 != 0) { - sPSSData->bg2_X += sPSSData->field_2CE; + sPSSData->bg2_X += sPSSData->wallpaperScrollSpeed; if (--sPSSData->field_2D0 != 0) return TRUE; sub_80CCEE0(); @@ -5327,7 +5327,7 @@ static bool8 ScrollToBox(void) return TRUE; } -static s8 sub_80CC644(u8 boxId) +static s8 DetermineBoxScrollDirection(u8 boxId) { u8 i; u8 currentBox = StorageGetCurrentBox(); @@ -5735,7 +5735,7 @@ static void sub_80CD210(struct Sprite *sprite) sprite->data[0] = 3; break; case 3: - sprite->pos1.x -= sPSSData->field_2CE; + sprite->pos1.x -= sPSSData->wallpaperScrollSpeed; if (sprite->pos1.x < 73 || sprite->pos1.x > 247) sprite->invisible = TRUE; if (--sprite->data[1] == 0) @@ -5746,7 +5746,7 @@ static void sub_80CD210(struct Sprite *sprite) } break; case 4: - sprite->pos1.x -= sPSSData->field_2CE; + sprite->pos1.x -= sPSSData->wallpaperScrollSpeed; break; } } @@ -6632,21 +6632,21 @@ static void sub_80CE7E8(void) sPSSData->field_218C.mon = &gUnknown_02039D14; sPSSData->field_2187 = 0; sPSSData->field_2186 = 0; - sPSSData->field_2188 = 0; + sPSSData->pokemonSummaryScreenMode = PSS_MODE_NORMAL; } else if (sBoxCursorArea == CURSOR_AREA_IN_PARTY) { sPSSData->field_218C.mon = gPlayerParty; sPSSData->field_2187 = sBoxCursorPosition; sPSSData->field_2186 = CountPartyMons() - 1; - sPSSData->field_2188 = 0; + sPSSData->pokemonSummaryScreenMode = PSS_MODE_NORMAL; } else { sPSSData->field_218C.box = GetBoxedMonPtr(StorageGetCurrentBox(), 0); sPSSData->field_2187 = sBoxCursorPosition; sPSSData->field_2186 = IN_BOX_COUNT - 1; - sPSSData->field_2188 = 2; + sPSSData->pokemonSummaryScreenMode = PSS_MODE_BOX; } } |