From 76aec05bb0071d9ecffd6ea72f75f95aaa67ea4d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Aug 2025 17:02:30 -0400 Subject: [PATCH] Address review comments, part 2 --- asm/include/overlay_01_021E6880.inc | 2 +- asm/overlay_01_021E6880.s | 2 +- .../pokegear/map/pokegear_map_internal.h | 2 +- include/metatile_behavior.h | 2 +- .../pokegear/map/overlay_101_021E9270.c | 4 +- src/application/pokegear/map/pokegear_map.c | 2610 +++++++---------- src/field/overlay_2_gear_phone.c | 4 +- src/metatile_behavior.c | 2 +- src/scrcmd_c.c | 6 +- src/start_menu.c | 2 +- src/voltorb_flip/voltorb_flip.c | 38 +- 11 files changed, 1137 insertions(+), 1537 deletions(-) diff --git a/asm/include/overlay_01_021E6880.inc b/asm/include/overlay_01_021E6880.inc index de1dbd990..b539198cf 100644 --- a/asm/include/overlay_01_021E6880.inc +++ b/asm/include/overlay_01_021E6880.inc @@ -86,7 +86,7 @@ .public sub_0205B76C .public sub_0205B78C .public sub_0205B7E0 -.public sub_0205B7EC +.public MetatileBehavior_IsTownMap .public sub_0205B7F8 .public sub_0205B804 .public sub_0205B810 diff --git a/asm/overlay_01_021E6880.s b/asm/overlay_01_021E6880.s index c6bb62132..9811aa96f 100644 --- a/asm/overlay_01_021E6880.s +++ b/asm/overlay_01_021E6880.s @@ -1554,7 +1554,7 @@ _021E74C4: pop {r3, r4, r5, r6, r7, pc} _021E74D2: add r0, r4, #0 - bl sub_0205B7EC + bl MetatileBehavior_IsTownMap cmp r0, #0 beq _021E74E0 ldr r0, _021E7604 ; =std_town_map diff --git a/include/application/pokegear/map/pokegear_map_internal.h b/include/application/pokegear/map/pokegear_map_internal.h index 06b319a33..bbbe65d89 100644 --- a/include/application/pokegear/map/pokegear_map_internal.h +++ b/include/application/pokegear/map/pokegear_map_internal.h @@ -151,7 +151,7 @@ typedef struct PokegearMapLocationSpec { u16 objXoffset : 4; u16 objYoffset : 4; u8 flavorText; - u8 tilemapUnk170BlockID; + u8 tilemapUnk174BlockID; u8 unk_8; // unused u8 unk_9; // unused u8 unk_A; // unused diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index 34ce4ffef..ad44babd9 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -24,7 +24,7 @@ BOOL sub_0205B7BC(u8 tile); BOOL sub_0205B7C8(u8 tile); BOOL sub_0205B7D4(u8 tile); BOOL sub_0205B7E0(u8 tile); -BOOL sub_0205B7EC(u8 tile); +BOOL MetatileBehavior_IsTownMap(u8 tile); BOOL sub_0205B7F8(u8 tile); BOOL sub_0205B804(u8 tile); BOOL sub_0205B810(u8 tile); diff --git a/src/application/pokegear/map/overlay_101_021E9270.c b/src/application/pokegear/map/overlay_101_021E9270.c index 8e05c9db5..2db45b5f1 100644 --- a/src/application/pokegear/map/overlay_101_021E9270.c +++ b/src/application/pokegear/map/overlay_101_021E9270.c @@ -845,9 +845,9 @@ static void ov101_021EAA0C(PokegearMapAppData *mapApp, BOOL a1, BOOL isKanto) { ScheduleBgTilemapBufferTransfer(mapApp->pokegear->bgConfig, GF_BG_LYR_SUB_2); return; } - if (locationSpec->tilemapUnk170BlockID != 0) { + if (locationSpec->tilemapUnk174BlockID != 0) { tilemap16CsrcX = 8; - tilemap174blockId = locationSpec->tilemapUnk170BlockID - 1; + tilemap174blockId = locationSpec->tilemapUnk174BlockID - 1; } else { tilemap16CsrcX = 0; tilemap174blockId = 0; diff --git a/src/application/pokegear/map/pokegear_map.c b/src/application/pokegear/map/pokegear_map.c index 6d87c0866..a6aa8377f 100644 --- a/src/application/pokegear/map/pokegear_map.c +++ b/src/application/pokegear/map/pokegear_map.c @@ -42,7 +42,7 @@ static const u16 sMapXScrollLimits[] = { BOOL PokegearMap_Init(OverlayManager *man, int *state) { PokegearAppData *pokegearApp = OverlayManager_GetArgs(man); HandleLoadOverlay(FS_OVERLAY_ID(OVY_26), OVY_LOAD_ASYNC); - CreateHeap(HEAP_ID_3, HEAP_ID_POKEGEAR_APP, 0x30000); + CreateHeap(HEAP_ID_3, HEAP_ID_POKEGEAR_APP, 196608); PokegearMapAppData *mapApp = OverlayManager_CreateAndGetData(man, sizeof(PokegearMapAppData), HEAP_ID_POKEGEAR_APP); memset(mapApp, 0, sizeof(PokegearMapAppData)); mapApp->pokegear = pokegearApp; @@ -363,8 +363,8 @@ static int PokegearMap_MainTask_FadeIn(PokegearMapAppData *mapApp) { } } PaletteData_SetAutoTransparent(mapApp->pokegear->plttData, TRUE); - PaletteData_BlendPalette(mapApp->pokegear->plttData, PLTTBUF_MAIN_BG, 0, 0xE0, 0, 0); - PaletteData_BlendPalette(mapApp->pokegear->plttData, PLTTBUF_MAIN_OBJ, 0x40, 0xC0, 0, 0); + PaletteData_BlendPalette(mapApp->pokegear->plttData, PLTTBUF_MAIN_BG, 0, 224, 0, 0); + PaletteData_BlendPalette(mapApp->pokegear->plttData, PLTTBUF_MAIN_OBJ, 64, 192, 0, 0); PaletteData_PushTransparentBuffers(mapApp->pokegear->plttData); PaletteData_SetAutoTransparent(mapApp->pokegear->plttData, FALSE); GfGfx_EngineATogglePlanes(GX_PLANEMASK_OBJ, TRUE); @@ -462,8 +462,8 @@ static int PokegearMap_MainTask_FadeOutApp(PokegearMapAppData *mapApp) { } break; case 2: - PaletteData_BlendPalette(mapApp->pokegear->plttData, PLTTBUF_MAIN_BG, 0, 0xE0, 16, 0); - PaletteData_BlendPalette(mapApp->pokegear->plttData, PLTTBUF_MAIN_OBJ, 0x40, 0xC0, 16, 0); + PaletteData_BlendPalette(mapApp->pokegear->plttData, PLTTBUF_MAIN_BG, 0, 224, 16, 0); + PaletteData_BlendPalette(mapApp->pokegear->plttData, PLTTBUF_MAIN_OBJ, 64, 192, 16, 0); PaletteData_PushTransparentBuffers(mapApp->pokegear->plttData); for (int i = 0; i < 3; ++i) { ToggleBgLayer(i + GF_BG_LYR_MAIN_1, FALSE); @@ -480,1902 +480,1502 @@ static int PokegearMap_MainTask_FadeOutApp(PokegearMapAppData *mapApp) { const PokegearMapLocationSpec sLocationSpecs[PGMAP_NUM_LOCATIONS] = { { .mapId = MAP_SINJOH_RUINS_EXTERIOR, - .x = 0x13, - .y = 0x02, - .width = 0x3, - .height = 0x3, - .objXoffset = 0x0, - .objYoffset = 0xC, + .x = 19, + .y = 2, + .width = 3, + .height = 3, + .objXoffset = 0, + .objYoffset = 12, .flavorText = msg_0273_00065, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x00, - .tilemapUnk170DestWidth = 0x00, - .tilemapUnk170DestHeight = 0x00, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 0, + .tilemapUnk170DestWidth = 0, + .tilemapUnk170DestHeight = 0, }, { .mapId = MAP_SS_AQUA_1F, - .x = 0x18, - .y = 0x10, - .width = 0x3, - .height = 0x3, - .objXoffset = 0x0, - .objYoffset = 0xC, + .x = 24, + .y = 16, + .width = 3, + .height = 3, + .objXoffset = 0, + .objYoffset = 12, .flavorText = msg_0273_00069, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x00, - .tilemapUnk170DestWidth = 0x00, - .tilemapUnk170DestHeight = 0x00, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 0, + .tilemapUnk170DestWidth = 0, + .tilemapUnk170DestHeight = 0, }, { .mapId = MAP_ICE_PATH_1F, - .x = 0x15, - .y = 0x06, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 21, + .y = 6, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00055, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_DARK_CAVE_ROUTE_45_SIDE, - .x = 0x11, - .y = 0x0A, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 17, + .y = 10, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00058, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0A, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 10, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_DARK_CAVE_ROUTE_45_SIDE, - .x = 0x13, - .y = 0x0C, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 19, + .y = 12, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00058, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0C, - .tilemapUnk170SrcY = 0x2C, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 12, + .tilemapUnk170SrcY = 44, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_DARK_CAVE_ROUTE_45_SIDE, - .x = 0x14, - .y = 0x08, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 20, + .y = 8, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00058, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0D, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 13, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_SPROUT_TOWER_1F, - .x = 0x0F, - .y = 0x09, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 15, + .y = 9, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00039, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_UNION_CAVE_1F, - .x = 0x0E, - .y = 0x0F, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 14, + .y = 15, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00046, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x08, - .tilemapUnk170SrcY = 0x2C, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 8, + .tilemapUnk170SrcY = 44, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_SLOWPOKE_WELL_ENTRANCE, - .x = 0x0D, - .y = 0x10, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 13, + .y = 16, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00047, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ILEX_FOREST, - .x = 0x0B, - .y = 0x10, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 11, + .y = 16, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00052, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x2D, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 45, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_NATIONAL_PARK, - .x = 0x0A, - .y = 0x08, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x4, + .x = 10, + .y = 8, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 4, .flavorText = msg_0273_00043, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x25, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 37, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_BELL_TOWER_1F, - .x = 0x0C, - .y = 0x06, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 12, + .y = 6, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00040, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_BURNED_TOWER_1F, - .x = 0x0B, - .y = 0x06, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 11, + .y = 6, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00042, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_MOUNT_MORTAR_1F_ENTRANCE, - .x = 0x0E, - .y = 0x07, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 14, + .y = 7, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00054, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_WHIRL_ISLANDS_1F, - .x = 0x07, - .y = 0x0D, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 7, + .y = 13, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00056, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x01, - .tilemapUnk170SrcY = 0x2E, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 1, + .tilemapUnk170SrcY = 46, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_TOHJO_FALLS, - .x = 0x17, - .y = 0x0E, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 23, + .y = 14, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00061, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x06, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 6, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_VICTORY_ROAD_1F, - .x = 0x1C, - .y = 0x09, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 28, + .y = 9, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00059, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x03, - .tilemapUnk170SrcY = 0x25, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 3, + .tilemapUnk170SrcY = 37, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_VIRIDIAN_FOREST, - .x = 0x20, - .y = 0x07, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 32, + .y = 7, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00062, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0F, - .tilemapUnk170SrcY = 0x29, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 15, + .tilemapUnk170SrcY = 41, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_DIGLETT_CAVE, - .x = 0x20, - .y = 0x06, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 32, + .y = 6, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00033, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0F, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 15, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_DIGLETT_CAVE, - .x = 0x2A, - .y = 0x0B, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 42, + .y = 11, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00033, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1C, - .tilemapUnk170SrcY = 0x2B, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 28, + .tilemapUnk170SrcY = 43, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_MOUNT_MOON, - .x = 0x24, - .y = 0x05, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 36, + .y = 5, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00034, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x06, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 6, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_CERULEAN_CAVE_1F, - .x = 0x28, - .y = 0x05, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 40, + .y = 5, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00035, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROCK_TUNNEL_1F, - .x = 0x2C, - .y = 0x06, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 44, + .y = 6, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00036, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1F, - .tilemapUnk170SrcY = 0x29, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 31, + .tilemapUnk170SrcY = 41, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_10_POWER_PLANT_BROKEN, - .x = 0x2C, - .y = 0x07, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 44, + .y = 7, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00067, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1F, - .tilemapUnk170SrcY = 0x2A, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 31, + .tilemapUnk170SrcY = 42, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_SEAFOAM_ISLANDS_1F, - .x = 0x23, - .y = 0x11, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 35, + .y = 17, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00038, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x06, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 6, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_BATTLE_FRONTIER, - .x = 0x06, - .y = 0x08, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x4, + .x = 6, + .y = 8, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 4, .flavorText = msg_0273_00050, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x25, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 37, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_FUCHSIA_PAL_PARK_ENTRANCE, - .x = 0x25, - .y = 0x0E, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 37, + .y = 14, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00037, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_OLIVINE_LIGHTHOUSE_2F, - .x = 0x09, - .y = 0x0A, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 9, + .y = 10, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00048, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_PALLET, - .x = 0x20, - .y = 0x0D, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 32, + .y = 13, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00010, - .tilemapUnk170BlockID = 0x01, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 1, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_VIRIDIAN, - .x = 0x1F, - .y = 0x09, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x4, + .x = 31, + .y = 9, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 4, .flavorText = msg_0273_00011, - .tilemapUnk170BlockID = 0x02, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x23, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 2, + .tilemapUnk170SrcX = 35, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_PEWTER, - .x = 0x20, - .y = 0x04, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x4, + .x = 32, + .y = 4, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 4, .flavorText = msg_0273_00012, - .tilemapUnk170BlockID = 0x03, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x23, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 3, + .tilemapUnk170SrcX = 35, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_CERULEAN, - .x = 0x28, - .y = 0x05, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x8, + .x = 40, + .y = 5, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 8, .flavorText = msg_0273_00013, - .tilemapUnk170BlockID = 0x04, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x12, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 4, + .tilemapUnk170SrcX = 18, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_LAVENDER, - .x = 0x2C, - .y = 0x09, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 44, + .y = 9, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00014, - .tilemapUnk170BlockID = 0x05, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 5, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_VERMILION, - .x = 0x28, - .y = 0x0B, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x4, + .x = 40, + .y = 11, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 4, .flavorText = msg_0273_00015, - .tilemapUnk170BlockID = 0x06, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x23, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 6, + .tilemapUnk170SrcX = 35, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_CELADON, - .x = 0x25, - .y = 0x09, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x4, + .x = 37, + .y = 9, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 4, .flavorText = msg_0273_00016, - .tilemapUnk170BlockID = 0x07, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x23, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 7, + .tilemapUnk170SrcX = 35, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_FUCHSIA, - .x = 0x25, - .y = 0x0E, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x8, + .x = 37, + .y = 14, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 8, .flavorText = msg_0273_00017, - .tilemapUnk170BlockID = 0x08, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x12, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 8, + .tilemapUnk170SrcX = 18, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_CINNABAR_ISLAND, - .x = 0x20, - .y = 0x11, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 32, + .y = 17, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00018, - .tilemapUnk170BlockID = 0x09, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 9, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_SAFFRON, - .x = 0x28, - .y = 0x08, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x4, + .x = 40, + .y = 8, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 4, .flavorText = msg_0273_00020, - .tilemapUnk170BlockID = 0x0A, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x23, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 10, + .tilemapUnk170SrcX = 35, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_NEW_BARK, - .x = 0x15, - .y = 0x0E, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 21, + .y = 14, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00021, - .tilemapUnk170BlockID = 0x0B, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 11, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_CHERRYGROVE, - .x = 0x10, - .y = 0x0E, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 16, + .y = 14, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00022, - .tilemapUnk170BlockID = 0x0C, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1A, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 12, + .tilemapUnk170SrcX = 26, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_VIOLET, - .x = 0x0E, - .y = 0x09, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x8, + .x = 14, + .y = 9, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 8, .flavorText = msg_0273_00023, - .tilemapUnk170BlockID = 0x0D, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0E, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 13, + .tilemapUnk170SrcX = 14, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_AZALEA, - .x = 0x0C, - .y = 0x10, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 12, + .y = 16, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00024, - .tilemapUnk170BlockID = 0x0E, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x16, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 14, + .tilemapUnk170SrcX = 22, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_CIANWOOD, - .x = 0x05, - .y = 0x0C, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 5, + .y = 12, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00025, - .tilemapUnk170BlockID = 0x0F, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x03, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 15, + .tilemapUnk170SrcX = 3, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_GOLDENROD, - .x = 0x09, - .y = 0x0C, - .width = 0x3, - .height = 0x2, - .objXoffset = 0x8, - .objYoffset = 0x4, + .x = 9, + .y = 12, + .width = 3, + .height = 2, + .objXoffset = 8, + .objYoffset = 4, .flavorText = msg_0273_00026, - .tilemapUnk170BlockID = 0x10, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1E, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x05, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 16, + .tilemapUnk170SrcX = 30, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 5, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_OLIVINE, - .x = 0x08, - .y = 0x09, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 8, + .y = 9, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00027, - .tilemapUnk170BlockID = 0x11, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x06, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 17, + .tilemapUnk170SrcX = 6, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_ECRUTEAK, - .x = 0x0B, - .y = 0x06, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x8, + .x = 11, + .y = 6, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 8, .flavorText = msg_0273_00028, - .tilemapUnk170BlockID = 0x12, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0A, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 18, + .tilemapUnk170SrcX = 10, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_MAHOGANY, - .x = 0x10, - .y = 0x07, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 16, + .y = 7, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00029, - .tilemapUnk170BlockID = 0x13, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 19, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_BLACKTHORN, - .x = 0x14, - .y = 0x06, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x8, + .x = 20, + .y = 6, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 8, .flavorText = msg_0273_00031, - .tilemapUnk170BlockID = 0x14, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0E, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 20, + .tilemapUnk170SrcX = 14, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_INDIGO_PLATEAU, - .x = 0x1C, - .y = 0x08, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 28, + .y = 8, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00019, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_LAKE_OF_RAGE, - .x = 0x0F, - .y = 0x03, - .width = 0x3, - .height = 0x2, - .objXoffset = 0x8, - .objYoffset = 0x4, + .x = 15, + .y = 3, + .width = 3, + .height = 2, + .objXoffset = 8, + .objYoffset = 4, .flavorText = msg_0273_00030, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1E, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x05, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 30, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 5, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_MOUNT_SILVER, - .x = 0x19, - .y = 0x0A, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 25, + .y = 10, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00057, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_RUINS_OF_ALPH_UNUSED, - .x = 0x0D, - .y = 0x0A, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 13, + .y = 10, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00045, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x03, - .tilemapUnk170SrcY = 0x20, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 3, + .tilemapUnk170SrcY = 32, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_SAFARI_ZONE_GATE, - .x = 0x02, - .y = 0x0A, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x4, + .x = 2, + .y = 10, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 4, .flavorText = msg_0273_00068, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x09, - .tilemapUnk170SrcY = 0x25, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 9, + .tilemapUnk170SrcY = 37, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_1, - .x = 0x20, - .y = 0x0B, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 32, + .y = 11, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00070, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0F, - .tilemapUnk170SrcY = 0x2E, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 15, + .tilemapUnk170SrcY = 46, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_2, - .x = 0x20, - .y = 0x08, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 32, + .y = 8, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00071, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0F, - .tilemapUnk170SrcY = 0x2A, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 15, + .tilemapUnk170SrcY = 42, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_3, - .x = 0x22, - .y = 0x05, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 34, + .y = 5, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00072, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x19, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 25, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_4, - .x = 0x25, - .y = 0x05, - .width = 0x3, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 37, + .y = 5, + .width = 3, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00073, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1C, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 28, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_5, - .x = 0x28, - .y = 0x07, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 40, + .y = 7, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00074, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x19, - .tilemapUnk170SrcY = 0x2C, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 25, + .tilemapUnk170SrcY = 44, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_6, - .x = 0x28, - .y = 0x0A, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 40, + .y = 10, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00075, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1A, - .tilemapUnk170SrcY = 0x2C, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 26, + .tilemapUnk170SrcY = 44, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_7, - .x = 0x27, - .y = 0x09, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 39, + .y = 9, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00076, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x18, - .tilemapUnk170SrcY = 0x2C, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 24, + .tilemapUnk170SrcY = 44, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_8, - .x = 0x2A, - .y = 0x09, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 42, + .y = 9, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00077, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1B, - .tilemapUnk170SrcY = 0x2C, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 27, + .tilemapUnk170SrcY = 44, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_9, - .x = 0x2A, - .y = 0x06, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 42, + .y = 6, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00078, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1D, - .tilemapUnk170SrcY = 0x29, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 29, + .tilemapUnk170SrcY = 41, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_10, - .x = 0x2C, - .y = 0x08, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 44, + .y = 8, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00079, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1F, - .tilemapUnk170SrcY = 0x2B, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 31, + .tilemapUnk170SrcY = 43, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_11, - .x = 0x2B, - .y = 0x0B, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 43, + .y = 11, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00080, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1D, - .tilemapUnk170SrcY = 0x2B, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 29, + .tilemapUnk170SrcY = 43, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_12, - .x = 0x2C, - .y = 0x0A, - .width = 0x1, - .height = 0x3, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 44, + .y = 10, + .width = 1, + .height = 3, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00081, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1E, - .tilemapUnk170SrcY = 0x2A, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 30, + .tilemapUnk170SrcY = 42, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_ROUTE_13, - .x = 0x2A, - .y = 0x0D, - .width = 0x3, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 42, + .y = 13, + .width = 3, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00082, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1C, - .tilemapUnk170SrcY = 0x2D, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 28, + .tilemapUnk170SrcY = 45, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_14, - .x = 0x2A, - .y = 0x0E, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 42, + .y = 14, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00083, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x1C, - .tilemapUnk170SrcY = 0x2E, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 28, + .tilemapUnk170SrcY = 46, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_15, - .x = 0x27, - .y = 0x0F, - .width = 0x3, - .height = 0x1, - .objXoffset = 0xC, - .objYoffset = 0x0, + .x = 39, + .y = 15, + .width = 3, + .height = 1, + .objXoffset = 12, + .objYoffset = 0, .flavorText = msg_0273_00084, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x19, - .tilemapUnk170SrcY = 0x2F, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 25, + .tilemapUnk170SrcY = 47, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_16, - .x = 0x23, - .y = 0x0A, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 35, + .y = 10, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00085, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x17, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 23, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_17, - .x = 0x23, - .y = 0x0B, - .width = 0x1, - .height = 0x4, - .objXoffset = 0x0, - .objYoffset = 0xC, + .x = 35, + .y = 11, + .width = 1, + .height = 4, + .objXoffset = 0, + .objYoffset = 12, .flavorText = msg_0273_00086, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x17, - .tilemapUnk170SrcY = 0x29, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 23, + .tilemapUnk170SrcY = 41, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_ROUTE_18, - .x = 0x23, - .y = 0x0F, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 35, + .y = 15, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00087, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x17, - .tilemapUnk170SrcY = 0x2D, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 23, + .tilemapUnk170SrcY = 45, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_19, - .x = 0x25, - .y = 0x10, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 37, + .y = 16, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00088, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x16, - .tilemapUnk170SrcY = 0x2D, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 22, + .tilemapUnk170SrcY = 45, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_20, - .x = 0x21, - .y = 0x11, - .width = 0x4, - .height = 0x1, - .objXoffset = 0x8, - .objYoffset = 0x0, + .x = 33, + .y = 17, + .width = 4, + .height = 1, + .objXoffset = 8, + .objYoffset = 0, .flavorText = msg_0273_00089, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x12, - .tilemapUnk170SrcY = 0x2E, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 18, + .tilemapUnk170SrcY = 46, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_21, - .x = 0x20, - .y = 0x0E, - .width = 0x1, - .height = 0x3, - .objXoffset = 0x0, - .objYoffset = 0xC, + .x = 32, + .y = 14, + .width = 1, + .height = 3, + .objXoffset = 0, + .objYoffset = 12, .flavorText = msg_0273_00090, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x11, - .tilemapUnk170SrcY = 0x2D, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 17, + .tilemapUnk170SrcY = 45, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_ROUTE_22, - .x = 0x1D, - .y = 0x0A, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 29, + .y = 10, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00091, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x15, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 21, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_24, - .x = 0x29, - .y = 0x04, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 41, + .y = 4, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00093, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x18, - .tilemapUnk170SrcY = 0x2A, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 24, + .tilemapUnk170SrcY = 42, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_25, - .x = 0x29, - .y = 0x03, - .width = 0x4, - .height = 0x1, - .objXoffset = 0xC, - .objYoffset = 0x0, + .x = 41, + .y = 3, + .width = 4, + .height = 1, + .objXoffset = 12, + .objYoffset = 0, .flavorText = msg_0273_00094, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x18, - .tilemapUnk170SrcY = 0x29, - .tilemapUnk170DestWidth = 0x04, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 24, + .tilemapUnk170SrcY = 41, + .tilemapUnk170DestWidth = 4, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_26, - .x = 0x1C, - .y = 0x0B, - .width = 0x1, - .height = 0x4, - .objXoffset = 0x0, - .objYoffset = 0xC, + .x = 28, + .y = 11, + .width = 1, + .height = 4, + .objXoffset = 0, + .objYoffset = 12, .flavorText = msg_0273_00095, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x14, - .tilemapUnk170SrcY = 0x29, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 20, + .tilemapUnk170SrcY = 41, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_ROUTE_27, - .x = 0x16, - .y = 0x0E, - .width = 0x6, - .height = 0x1, - .objXoffset = 0xF, - .objYoffset = 0x0, + .x = 22, + .y = 14, + .width = 6, + .height = 1, + .objXoffset = 15, + .objYoffset = 0, .flavorText = msg_0273_00096, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0E, - .tilemapUnk170SrcY = 0x2C, - .tilemapUnk170DestWidth = 0x06, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 14, + .tilemapUnk170SrcY = 44, + .tilemapUnk170DestWidth = 6, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_28, - .x = 0x1A, - .y = 0x0A, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 26, + .y = 10, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00097, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x12, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 18, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_29, - .x = 0x12, - .y = 0x0E, - .width = 0x3, - .height = 0x1, - .objXoffset = 0xC, - .objYoffset = 0x0, + .x = 18, + .y = 14, + .width = 3, + .height = 1, + .objXoffset = 12, + .objYoffset = 0, .flavorText = msg_0273_00098, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0B, - .tilemapUnk170SrcY = 0x2E, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 11, + .tilemapUnk170SrcY = 46, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_30, - .x = 0x11, - .y = 0x0B, - .width = 0x1, - .height = 0x3, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 17, + .y = 11, + .width = 1, + .height = 3, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00099, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0A, - .tilemapUnk170SrcY = 0x29, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x03, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 10, + .tilemapUnk170SrcY = 41, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 3, }, { .mapId = MAP_ROUTE_31, - .x = 0x10, - .y = 0x0A, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x1, - .objYoffset = 0x0, + .x = 16, + .y = 10, + .width = 2, + .height = 1, + .objXoffset = 1, + .objYoffset = 0, .flavorText = msg_0273_00100, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x09, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 9, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_32, - .x = 0x0E, - .y = 0x0B, - .width = 0x1, - .height = 0x4, - .objXoffset = 0x0, - .objYoffset = 0xC, + .x = 14, + .y = 11, + .width = 1, + .height = 4, + .objXoffset = 0, + .objYoffset = 12, .flavorText = msg_0273_00101, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x08, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 8, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_ROUTE_33, - .x = 0x0E, - .y = 0x10, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 14, + .y = 16, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00102, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x08, - .tilemapUnk170SrcY = 0x2D, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 8, + .tilemapUnk170SrcY = 45, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_34, - .x = 0x0B, - .y = 0x0E, - .width = 0x1, - .height = 0x3, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 11, + .y = 14, + .width = 1, + .height = 3, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00103, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x2B, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 43, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_35, - .x = 0x0B, - .y = 0x0A, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 11, + .y = 10, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00104, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x02, - .tilemapUnk170SrcY = 0x2D, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 2, + .tilemapUnk170SrcY = 45, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_36, - .x = 0x0B, - .y = 0x09, - .width = 0x3, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 11, + .y = 9, + .width = 3, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00105, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x02, - .tilemapUnk170SrcY = 0x2C, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 2, + .tilemapUnk170SrcY = 44, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_37, - .x = 0x0C, - .y = 0x08, - .width = 0x1, - .height = 0x1, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 12, + .y = 8, + .width = 1, + .height = 1, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00106, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x03, - .tilemapUnk170SrcY = 0x2B, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 3, + .tilemapUnk170SrcY = 43, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_38, - .x = 0x09, - .y = 0x07, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 9, + .y = 7, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00107, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x01, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 1, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_39, - .x = 0x08, - .y = 0x07, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 8, + .y = 7, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00108, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_40, - .x = 0x07, - .y = 0x0A, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 7, + .y = 10, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00109, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x01, - .tilemapUnk170SrcY = 0x2A, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 1, + .tilemapUnk170SrcY = 42, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_41, - .x = 0x06, - .y = 0x0C, - .width = 0x2, - .height = 0x2, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 6, + .y = 12, + .width = 2, + .height = 2, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00110, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x00, - .tilemapUnk170SrcY = 0x2C, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 0, + .tilemapUnk170SrcY = 44, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_42, - .x = 0x0D, - .y = 0x07, - .width = 0x3, - .height = 0x1, - .objXoffset = 0x2, - .objYoffset = 0x0, + .x = 13, + .y = 7, + .width = 3, + .height = 1, + .objXoffset = 2, + .objYoffset = 0, .flavorText = msg_0273_00111, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x02, - .tilemapUnk170SrcY = 0x2A, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 2, + .tilemapUnk170SrcY = 42, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_43, - .x = 0x10, - .y = 0x05, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x4, + .x = 16, + .y = 5, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 4, .flavorText = msg_0273_00112, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x03, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 3, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_44, - .x = 0x11, - .y = 0x07, - .width = 0x3, - .height = 0x1, - .objXoffset = 0x8, - .objYoffset = 0x0, + .x = 17, + .y = 7, + .width = 3, + .height = 1, + .objXoffset = 8, + .objYoffset = 0, .flavorText = msg_0273_00113, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x05, - .tilemapUnk170SrcY = 0x2A, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 5, + .tilemapUnk170SrcY = 42, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_45, - .x = 0x14, - .y = 0x09, - .width = 0x1, - .height = 0x4, - .objXoffset = 0x0, - .objYoffset = 0x8, + .x = 20, + .y = 9, + .width = 1, + .height = 4, + .objXoffset = 0, + .objYoffset = 8, .flavorText = msg_0273_00114, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0D, - .tilemapUnk170SrcY = 0x29, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x04, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 13, + .tilemapUnk170SrcY = 41, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 4, }, { .mapId = MAP_ROUTE_46, - .x = 0x13, - .y = 0x0D, - .width = 0x1, - .height = 0x2, - .objXoffset = 0x0, - .objYoffset = 0x0, + .x = 19, + .y = 13, + .width = 1, + .height = 2, + .objXoffset = 0, + .objYoffset = 0, .flavorText = msg_0273_00115, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x0C, - .tilemapUnk170SrcY = 0x2D, - .tilemapUnk170DestWidth = 0x01, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 12, + .tilemapUnk170SrcY = 45, + .tilemapUnk170DestWidth = 1, + .tilemapUnk170DestHeight = 1, }, { .mapId = MAP_ROUTE_47, - .x = 0x02, - .y = 0x0D, - .width = 0x3, - .height = 0x2, - .objXoffset = 0x8, - .objYoffset = 0x4, + .x = 2, + .y = 13, + .width = 3, + .height = 2, + .objXoffset = 8, + .objYoffset = 4, .flavorText = msg_0273_00116, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x20, - .tilemapUnk170SrcY = 0x29, - .tilemapUnk170DestWidth = 0x03, - .tilemapUnk170DestHeight = 0x02, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 32, + .tilemapUnk170SrcY = 41, + .tilemapUnk170DestWidth = 3, + .tilemapUnk170DestHeight = 2, }, { .mapId = MAP_ROUTE_48, - .x = 0x02, - .y = 0x0C, - .width = 0x2, - .height = 0x1, - .objXoffset = 0x4, - .objYoffset = 0x0, + .x = 2, + .y = 12, + .width = 2, + .height = 1, + .objXoffset = 4, + .objYoffset = 0, .flavorText = msg_0273_00117, - .tilemapUnk170BlockID = 0x00, - .unk_8 = 0x00, - .unk_9 = 0x00, - .unk_A = 0x00, - .unk_B = 0x00, - .tilemapUnk170SrcX = 0x20, - .tilemapUnk170SrcY = 0x28, - .tilemapUnk170DestWidth = 0x02, - .tilemapUnk170DestHeight = 0x01, + .tilemapUnk174BlockID = 0, + .tilemapUnk170SrcX = 32, + .tilemapUnk170SrcY = 40, + .tilemapUnk170DestWidth = 2, + .tilemapUnk170DestHeight = 1, }, }; diff --git a/src/field/overlay_2_gear_phone.c b/src/field/overlay_2_gear_phone.c index ec29932c6..606e1b4f3 100644 --- a/src/field/overlay_2_gear_phone.c +++ b/src/field/overlay_2_gear_phone.c @@ -85,8 +85,8 @@ u8 ov02_02251EE8(GearPhoneRingManager *gearPhone, Unk_PokegearSTRUCT_14 *a1) { } a1->unk_0 = gearPhone->unk_arr5[0]; a1->unk_1 = gearPhone->unk_arr5[1]; - a1->isScriptedCall = gearPhone->isScriptedCall; // 2 = scripted? - a1->callScriptID = gearPhone->callScriptID; // message ID? + a1->isScriptedCall = gearPhone->isScriptedCall; + a1->callScriptID = gearPhone->callScriptID; a1->unk_2 = gearPhone->unk_var7; return gearPhone->callerId; } diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 909262d15..93a703a35 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -92,7 +92,7 @@ BOOL sub_0205B7E0(u8 tile) { return tile == TILE_BEHAVIOR_131; } -BOOL sub_0205B7EC(u8 tile) { +BOOL MetatileBehavior_IsTownMap(u8 tile) { return tile == TILE_BEHAVIOR_TOWN_MAP; } diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 3191a90f1..7fde5e808 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -1734,11 +1734,11 @@ BOOL ScrCmd_PokemonSummaryScreen(ScriptContext *ctx) { } BOOL ScrCmd_GetPhoneBookRematch(ScriptContext *ctx) { - u16 r4 = ScriptGetVar(ctx); - u16 *r6 = ScriptGetVarPointer(ctx); + u16 idx = ScriptGetVar(ctx); + u16 *pRet = ScriptGetVarPointer(ctx); struct PhoneBook *phoneBook = AllocAndReadPhoneBook(HEAP_ID_32); HandleLoadOverlay(FS_OVERLAY_ID(OVY_26), OVY_LOAD_ASYNC); - *r6 = PhoneBookTrainerGetRematchInfo(r4, ctx->fieldSystem->saveData, phoneBook, Field_GetTimeOfDayWildParam(ctx->fieldSystem)); + *pRet = PhoneBookTrainerGetRematchInfo(idx, ctx->fieldSystem->saveData, phoneBook, Field_GetTimeOfDayWildParam(ctx->fieldSystem)); UnloadOverlayByID(FS_OVERLAY_ID(OVY_26)); FreePhoneBook(phoneBook); return FALSE; diff --git a/src/start_menu.c b/src/start_menu.c index 8b305bfa1..903337309 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1376,7 +1376,7 @@ BOOL Task_UseFlyInField(TaskManager *taskManager) { StartMenu_SetExitTaskFunc(startMenu, Task_StartMenu_HandleReturn_Pokemon); } else { Pokemon *pokemon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->saveData), partySlot); - struct UnkStruct_02067BF8 *r5 = sub_02067BF8(HEAP_ID_FIELD, fieldSystem, pokemon, partySlot, pokegearArgs->selectedFlyDest, pokegearArgs->mapCursorX * 32 + 0x10, pokegearArgs->mapCursorY * 32 + 0x10); + struct UnkStruct_02067BF8 *r5 = sub_02067BF8(HEAP_ID_FIELD, fieldSystem, pokemon, partySlot, pokegearArgs->selectedFlyDest, pokegearArgs->mapCursorX * 32 + 16, pokegearArgs->mapCursorY * 32 + 16); Heap_FreeExplicit(HEAP_ID_FIELD, startMenu->exitTaskEnvironment); FieldSystem_LoadFieldOverlay(fieldSystem); startMenu->exitTaskFunc = sub_02067C30; diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c index f058b6413..2fb19d3a3 100644 --- a/src/voltorb_flip/voltorb_flip.c +++ b/src/voltorb_flip/voltorb_flip.c @@ -1823,35 +1823,35 @@ _021E7BE4: // clang-format on #endif // NONMATCHING -static ManagedSprite *ov122_021E7C9C(SpriteSystem *a0, SpriteManager *a1, u16 a2, u16 a3, u16 a4, u16 a5) { +static ManagedSprite *ov122_021E7C9C(SpriteSystem *spriteSystem, SpriteManager *spriteManager, u16 x, u16 y, u16 animation, u16 drawPriority) { ManagedSpriteTemplate temp1 = ov122_021E9374; - GF_ASSERT(a0 != NULL); - GF_ASSERT(a1 != NULL); + GF_ASSERT(spriteSystem != NULL); + GF_ASSERT(spriteManager != NULL); - temp1.x = a2; - temp1.y = a3; - temp1.animation = a4; - temp1.drawPriority = a5; + temp1.x = x; + temp1.y = y; + temp1.animation = animation; + temp1.drawPriority = drawPriority; - ManagedSprite *var1 = SpriteSystem_NewSpriteWithYOffset(a0, a1, &temp1, 0x20c000); - ManagedSprite_SetAnimateFlag(var1, 1); - ManagedSprite_SetDrawFlag(var1, 0); - return var1; + ManagedSprite *ret = SpriteSystem_NewSpriteWithYOffset(spriteSystem, spriteManager, &temp1, 0x20c000); + ManagedSprite_SetAnimateFlag(ret, 1); + ManagedSprite_SetDrawFlag(ret, 0); + return ret; } -static ManagedSprite *ov122_021E7D04(SpriteSystem *a0, SpriteManager *a1, u16 a2, u16 a3, u16 a4, u16 a5) { +static ManagedSprite *ov122_021E7D04(SpriteSystem *spriteSystem, SpriteManager *spriteManager, u16 x, u16 y, u16 animation, u16 drawPriority) { ManagedSpriteTemplate temp1 = ov122_021E93A8; - GF_ASSERT(a0 != NULL); - GF_ASSERT(a1 != NULL); + GF_ASSERT(spriteSystem != NULL); + GF_ASSERT(spriteManager != NULL); - temp1.x = a2; - temp1.y = a3; - temp1.animation = a4; - temp1.drawPriority = a5; + temp1.x = x; + temp1.y = y; + temp1.animation = animation; + temp1.drawPriority = drawPriority; - ManagedSprite *var1 = SpriteSystem_NewSpriteWithYOffset(a0, a1, &temp1, 0x20c000); + ManagedSprite *var1 = SpriteSystem_NewSpriteWithYOffset(spriteSystem, spriteManager, &temp1, 0x20c000); ManagedSprite_SetAnimateFlag(var1, 1); ManagedSprite_SetDrawFlag(var1, 0); return var1;